Pull in first two commits of bsce's "Implement Localization" (pull request #102)