Eric Schulte <schulte.eric@gmail.com> writes:

> This patch is still broken

(I don't know why ~$ git format-patch master did not produce an
applicable patch.)

These three ones are applicable against master/68d4de2.

Bare in mind this is just meant as a proof it "works", we can
rework the patches later on.