Merge pull request #371 from symfony-fr/2.3

Merge back 2.3 to 2.4
Typo

related #363
Merge pull request #372 from mhor/patch-2

Typo
Merge pull request #373 from symfony-fr/2.3

Merging 2.3 into 2.4
Merge pull request #374 from symfony-fr/2.4

Merging 2.4 into master