Merge pull request #7703 from neheb/patch-8