Locked symfony-mocker-container version
Merge branch 'master' into prophecy-migration

Conflicts:
	composer.json