Merge branch 'master' of https://github.com/symfony/symfony into HEAD

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Test/WebTestCase.php