Merge pull request #5309 from tobiasd/20180701-de