Fix issue with media manager
Merge branch 'master' of git://github.com/akeneo/pim-community-dev