Merge branch 'jc/makefile-redirection-stderr' into maint