bump to 2.3.7 of groovy
Straighten out problems in data generation.
Merge remote-tracking branch 'origin/master'