Merge origin/master

Conflicts:
	composer.lock
Merge origin/master

Conflicts:
	composer.lock