Upgrade to groovy 2.3.6