Merge branch 'ae/better-template-failure-report' into maint

* ae/better-template-failure-report:
  Improve error messages when temporary file creation fails

diff --cc Makefile
Simple merge

diff --cc wrapper.c
Simple merge