Corrected bug with homogeinzation
Merge branch 'master' of github.com:akeneo/pim-community-dev
Revert "Fix twig template used for translatable fields"

This reverts commit dff88acc6f32f328c8fc0d01239d1aa0b8cea92e.
Merge branch 'master' of github.com:akeneo/pim-community-dev
Merge branch 'master' into mongodb/PIM-1776