Update to GeoTools 9.4