Merge branch 'master' into enhancement/refactor-to-ext-amqp

Conflicts:
	composer.json