Merge pull request #1809 from dud3/patch-1