Fix issue with doctrine annotation driver
Merge branch 'sonata/master'