Updating groovy-devel from master

This PR should make groovy-devel be up to date with the latest development in master. I will do the same for hydro-devel next. We should definitely stop developing in master and do it in the latest devel devel branch (hydro now).