Fix https://github.com/sonata-project/SonataAdminBundle/issues/1315
Merge branch 'sonata/master'