Merge pull request #549 from tobiasd/20180316-translations