Merge pull request #7467 from neheb/patch-19