Played with sonata-media-bundle
Merge remote-tracking branch 'origin/master'