Groovy 2.1.9

Two commits: one for the current production version (2.1.9), and one for the current release candidate (2.2.0-rc3).