Merge pull request #8341 from neheb/patch-6