Fix bug with locale #211
Merge pull request #213 from akeneo/fix/mapping

Fix bug with locale #211
Merge branch 'master' into fix/phpDoc