Upgrade Groovy version.
Merge branch 'master' into jdk8