Merge branch 'geoapi-3.1': remove deprecated methods.