Port groovy-devel patch to hydro-devel