Fixes Unit and CS
Merge branch 'master' of github.com:akeneo/pim-community-dev