Oh no, not more branches ;)
In discussing plans or this branch we even talked about migrating the image/oldimage schema to a saner one (resembling page/revision), but decided to delay that for a while and do this first.