Merge pull request #6856 from neheb/patch-25