Cherry-pick the https://issues.apache.org/jira/browse/SIS-486 fix from geoapi-4.0 branch.
11 files changed