Upgrade to Groovy 2.1.2-SNAPSHOT