Merge branch 'geoapi-3.1': last-minute API changes before 1.0 release.