Merge pull request #6283 from neheb/patch-4