Hg: Merge in group-group recovery improvements
Mercurial revision: 515afdcb7134930fd48f944da1b9a98849840891