Merge branch 'master' of https://github.com/magento/magento2

Conflicts:
	lib/internal/Magento/Framework/View/Asset/Minified.php
Merge branch 'master' of github.com:moisemorard/magento2