Merge remote-tracking branch 'origin/groovy-devel' into groovy-devel