Merge pull request #4923 from neheb/patch-2