Changed from 'patch' to 'git apply' - more powerful, and will do binary patching.