Upgraded to Groovy 2.2.2