Merge pull request #4330 from wevsty/patch-1