Merging changes from master into groovy-devel

This will likely be the last commit to the groovy-devel branch.