Merge pull request #7706 from neheb/patch-11