Merge remote-tracking branch 'upstream/master' into add-zipcode-search

Author: goodevilgenius

.travis.yml

@@ -1,18 +1,20 @@
-language: php
-
+dist: trusty
 sudo: false
 
-php:
-  - 5.3
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-  - nightly
-  - hhvm
+language: php
 
 matrix:
+  include:
+    - php: hhvm
+    - php: nightly
+    - php: 7.2
+    - php: 7.1
+    - php: 7.0
+    - php: 5.6
+    - php: 5.5
+    - php: 5.4
+    - php: 5.3
+      dist: precise
   fast_finish: true
   allow_failures:
     - php: nightly