Hey,

> I think we can now merge on ‘master’.  There might still be rough edges
> but the guts of it is in good shape AFAICS so we can polish it on
> ‘master’.

Yes I think we can continue the polishing on master :). Here's a small
patch to the TODO file with some suggestions made by Björn and you.

Mathieu