Migrate to Groovy 2.3.4