Merge branch 'rj/remove-unused-mktemp' into maint