Hi Ryan,

Can you rebase your branch on master? That should significantly reduce the size
of the diff, considering I've already cherry-picked a number of your
contributions.

Cheers,

Jelmer