fixes #1496
Merge branch 'translation-mode'