Merge pull request #506 from symfony-fr/2.4

Merging 2.4
fixing build errors
Merge remote-tracking branch 'origin/master'
fixing conflict