fix for GRAILS-3324 and GRAILS-4391
fix for GRAILS-3324 and GRAILS-4391

clockworkorange/grails-core,clockworkorange/grails-core,erdi/grails-core,erdi/grails-core,clockworkorange/grails-core,erdi/grails-core,clockworkorange/grails-core,clockworkorange/grails-core