Upgrade Grails to 2.3.7
Stash changes
Merge branch 'release/R1'