ensure locales are not overwritten
Merge pull request #502 from ZogStriP/ensure-locales-are-not-overwritten

ensure locales are not overwritten