Merge pull request #213 from thomastrapp/master

Fix locale handling when building with cmake