Merge branch 'geoapi-3.1': port fixes from Apache SIS 1.0-RC1.