Rebase from geotools/geotools

Pull from origin