fork from geotools, for bugfixes