Update to HG changeset 7e569a9cb5fd