Merge pull request #6652 from neheb/patch-21