Merging master with groovy-devel