Upgrade the Groovy version.
Merge branch 'master' into jdk7