Merge pull request #2394 from Mailaender/patch-1