Merged branch from another server (by hand because of very different versions).