Merge pull request #594 from symfony-cmf/dev

1.2.0