Merge pull request #6909 from neheb/patch-34