Merge branch 'jc/mkstemp-more-careful-error-reporting'