Merge branch 'jc/no-grepping-for-strerror-in-tests'