Update to HG changeset 069f43a215cc