The merge was quite messy. For some strange reason, I got hundreds of files with conflicts. Maybe because it had been a long time that we hadn't done a merge.
In any case, the merged branch still passes the few gimplification tests we have, so it can't be too broken.
