Merge pull request #6253 from neheb/patch-14