merge-forward: Fix for OS X mktemp
Merge pull request #518 from totten/merge-forward-mktemp

merge-forward: Fix for OS X mktemp