Fix failing specs on master #158
Merge pull request #159 from akeneo/fix/testmaster

Fix failing specs on master #158
Merge branch 'master' into fix/magento-attributeid