Merge "Last patch broke creating new file as a patch, fix it. (Matches beginning and EOF at once.)"