Auto-Merge pull request #2519 from octo/ff/strerror