Switched to GeoTools 8.7
Merge branch 'geotools87'