Update to HG changeset e11a8a2e225d