After the last merge some fairly trivial tests are suddenly failing, so we seem to have merged this somewhat prematurely.

I will give it a look tomorrow, or do you have free cycles @tmbrbr ?