Merge remote-tracking branch 'origin/master' into departure-tar

.travis.yml

@@ -11,7 +11,7 @@ mysql:
 
 install:
   - travis_retry composer self-update && composer update nothing && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.0.3"
+  - travis_retry composer global require fxp/composer-asset-plugin --no-plugins
   - composer install --prefer-source --no-interaction --dev
   - wget http://codeception.com/codecept.phar -O vendor/bin/codecept && chmod +x vendor/bin/codecept
   - echo 'xdebug.max_nesting_level=600' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini