Merge pull request #6216 from neheb/patch-7