Update to Groovy 2.1.8