Merging old head via |hg debugsetparents 05025f4889a0 15ced10dfc22|. CLOSED TREE DONTBUILD