Merge "Fix breakage caused by mktemp on older macOS"