Removing bad merge modif
Fixing some build errors
Fixing some build errors
Merge branch '2.3' into 2.4
fixing typo
fixing another typo
Merge pull request #467 from symfony-fr/2.4

2.4