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