Update to HG changeset baa61856643b