Fix for GRAILS-10403
Merge pull request #141 from boardbloke/master

Fix for GRAILS-10403