Merge pull request #7683 from neheb/patch-3