Fix mktemp parameter to make it Mac-ompatible
Merge branch 'mktemp'