Merging master changes with groovy-devel