diff --git a/.travis.yml b/.travis.yml
index 69a5f1c55d5e..e35f56479cbf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,8 @@
 sudo: required
 os: linux
-dist: trusty
+dist: xenial
 language: python
 python: 3.6
-group: deprecated-2017Q4
 services:
   - docker
 matrix:
@@ -32,6 +31,9 @@ matrix:
         firefox: latest-esr
       env: TEST="firefox esr" BROWSER=firefox
 before_install:
+  # IPv6 https://github.com/travis-ci/travis-ci/issues/8891#issuecomment-353403729
+  - echo '{"ipv6":true,"fixed-cidr-v6":"2001:db8:1::/64"}' | sudo tee /etc/docker/daemon.json
+  - sudo service docker restart
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 before_script: travis_retry test/setup_travis.sh
diff --git a/src/chrome/content/rules/Haproxy.org.xml b/src/chrome/content/rules/Haproxy.org.xml
index bab249320888..99a18ec9ec5c 100644
--- a/src/chrome/content/rules/Haproxy.org.xml
+++ b/src/chrome/content/rules/Haproxy.org.xml
@@ -16,3 +16,4 @@
 
 	<rule from="^http:" to="https:" />
 </ruleset>
+