Changes to support grails-datastore-gorm build snapshot 3.1.3