clean
clean
cleanup
cleanup
Merge branch 'master' into releases

Conflicts:
	composer.json