Merge pull request #7466 from neheb/patch-17