Merge commit '6d826e8a' into v2.0

I merge the patch --save-originals stuff on v2.0.
I am using it a lot and I think it is stable enough to go to v2.0.
This will allow to modify gromacs patch also in that version.

Conflicts:
	patches/patch.sh