Update to HG changeset b8da1339f9fc