Merge branch 'master' into develop

Conflicts:
	composer.json
	composer.lock