Merge pull request #1775 from stapelberg/patch-1