upgrade to Groovy 2.1.6