Update version of Groovy.
Merge branch 'master' into jdk8