Merge pull request #767 from tobiasd/20181031-de