Merge pull request #994 from boblennes/develop

Translation Module Enhancements - part 1 of 2
Merge pull request #3 from ci-bonfire/develop

Merge pull request #994 from boblennes/develop