Merge branch 'groovy-devel' into groovy