Merge pull request #3678 from tobiasd/20170904-langdet