Merge branch 'master' of git://github.com/symfony/symfony into feature/form-twig-prototype

Conflicts:
	src/Symfony/Component/Form/Tests/AbstractLayoutTest.php