Upgrade to Groovy 2.3.6

Closes #1304