Upgraded Groovy to v2.3.6