Looks except for the first part, check the first comment made by @puiterwijk on the ticket #329 ;-)
@puiterwijk could you please take a look at this patch?
I looks like a part of my reply is missing, my original comment was:
Looks good except for the first part, check the first comment made by puiterwijk on the ticket #329 ;-)
Thanks! I'll do the merge manually to keep the history linear
Btw, this broke the unit-test suite, we should be careful with this next time :)