Merge pull request #1 from symfony/master

merge