Merge pull request #6837 from neheb/patch-33