Marlin 2.0!

Agreed, this is the moral equivalent of a rebase, just has to be manual if they have done serious refactoring.

Then in the future, assuming they are no longer renaming variables all over the place, it should be easy to transfer the changes to an updated underlying version.