GeoTools

Backport warp improvements to the 2.6 branch