Merge pull request #7295 from tobiasd/20190622-lang