Can't figure out how to get the line endings in original patch to apply correctly with git-formatted patch. fixes #2007