Merge branch '3.1' into 3.2

.travis.yml

@@ -2,6 +2,11 @@ language: php
 
 sudo: false
 
+addons:
+  apt:
+    packages:
+      - tidy
+
 cache:
   directories:
     - $HOME/.composer/cache
@@ -44,9 +49,6 @@ matrix:
       env: DB=MYSQL
     - php: hhvm
       env: DB=MYSQL
-      before_install:
-        - sudo apt-get update -qq
-        - sudo apt-get install -y tidy
 
 before_script:
  - composer self-update || true