Merge pull request #5827 from neheb/patch-4