Bring up to date with earthiverse:master