Merge pull request #6252 from neheb/patch-13