test dev-master
Merge pull request #421 from FriendsOfSymfony/dev-master

test dev-master