2.3.1 updates
Merge branch 'master' of https://github.com/groovy/groovy-eclipse