Upgrade to Groovy 2.3.5

Closes #1299