Merge pull request #4256 from Zweihorn/patch-1