Merge pull request #7766 from neheb/patch-9