am a980fb39: Merge "Refactor RunInLocale a bit"

* commit 'a980fb39a5ce8b3103c74c654a4e11550ae6d632':
  Refactor RunInLocale a bit