Merge pull request #5323 from cherusker/cherusker-2017-08-07-fix-strerror