Merge origin/master

Conflicts:
	composer.lock
	src/Acme/DemoBundle/AcmeDemoBundle.php