Merge pull request #6440 from neheb/patch-12