Merge branch 'master' into 3.0

Author: gsherwood

.travis.yml

@@ -11,6 +11,13 @@ php:
   - hhvm
   - nightly
 
+matrix:
+  fast_finish: true
+
+  allow_failures:
+    # Allow failures for unstable builds.
+    - php: nightly
+
 before_script:
   - if [[ ${TRAVIS_PHP_VERSION:0:1} != "7" && $TRAVIS_PHP_VERSION != "nightly" && $TRAVIS_PHP_VERSION != "hhvm" ]]; then phpenv config-add php5-testingConfig.ini; fi
   - if [[ ${TRAVIS_PHP_VERSION:0:1} == "7" || $TRAVIS_PHP_VERSION == "nightly" ]]; then phpenv config-add php7-testingConfig.ini; fi