Update to GeoTools 9.5