Upgrades to groovy 2.3