Port groovy-devel patch to hydro-devel
Merge pull request #53 from mikeferguson/patch-1

Port groovy-devel patch to hydro-devel