Merge pull request #6910 from neheb/patch-35