Merge pull request #8066 from neheb/patch-5