ensure locales are not overwritten
Merge pull request #504 from ZogStriP/ensure-locales-are-not-overwritten-take-2

ensure locales are not overwritten