Merge pull request #7442 from neheb/patch-17