Merge pull request #591 from laanwj/translation_lookup_logic