Fixed bug with certain PHP versions
Merge branch 'master' of github.com:akeneo/pim-community-dev
Merge branch 'master' into PIM-1929