Merge remote-tracking branch 'upstream/master'
composer rename

Conflicts:
	composer.json