Merging latest groovy-devel with master branch