Merge pull request #9493 from jwilk/errno