Working towards a grails 2.3.0 upgrade
Merge