Merge pull request #66 from amcgowanca/7.x

Localization related patches