Merge branch '3.6' into 4.1

Author: GrahamCampbell

.travis.yml

@@ -4,12 +4,14 @@ jobs:
       dist: trusty
       language: php
       php: 5.5.9
+      before_install: composer self-update --2
       install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: PHP 5.5
       dist: trusty
       language: php
       php: 5.5
+      before_install: composer self-update --2
       install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: PHP 5.6