Update to GeoTools 8.5