Merge pull request #7264 from neheb/patch-26