Merge branch 'master' into enhancement/build-release

Conflicts:
	.travis.yml

.travis.yml

@@ -28,6 +28,7 @@ after_success:
 before_deploy:
   - deploy-phpdoc-release.sh
   - composer install --no-dev --optimize-autoloader
+  - find vendor/ -type d -path 'vendor/*/*/.git' -print0 | xargs -0 rm -rf
   - tar -czf "pico-release-$TRAVIS_TAG.tar.gz" README.md LICENSE CONTRIBUTING.md CHANGELOG.md composer.json composer.lock config content-sample lib plugins themes vendor .htaccess index.php
 
 deploy: