merging our changes to groovy-devel into hydro-devel