Merge pull request #6500 from neheb/patch-7