Merge pull request #9485 from neheb/patch-17