Update to HG changeset c010db3c6ab7