Fix issue with duplicate class and php version < 5.3.4
Merge branch 'sonata/master'