Merge pull request #994 from boblennes/develop

Translation Module Enhancements - part 1 of 2