Merge pull request #3944 from dregad/patch-1