fixes #96
Merge branch 'hydro-devel' into groovy-devel