Merge pull request #5122 from tobiasd/20180525-4146