Merge remote-tracking branch 'origin/tests-integration' into tests-integration

Conflicts:
	composer.json