Merge pull request #1030 from tobiasd/20201007-langfilter