Upgrade to Groovy 2.3.6

Closes #1304
Merge branch '1.1.x'