git apply did not work for me but patch worked on first try. Weird.