Merge pull request #6892 from neheb/patch-31