Merge pull request #7768 from neheb/patch-13