Merge branch 'master-mainline' into masterPlusAliases

Conflicts:
	src/Composer/Satis/Command/BuildCommand.php