Update to HG changeset 9838aecd6340