Updated for Groovy 2.3.5