Upgrade to Groovy 2.3.6