Merge origin/master

Conflicts:
	composer.lock