wow, oops, I really thought I merged this one a long time ago...

is it ok for you if I merge it today and you rebase on top of it ?