Merge pull request #6800 from neheb/patch-28