Fix localization in OS X
Merge pull request #2844 from federicobond/fix-osx-localization

Fix localization in OS X