yet another workaround for stupid bloody grails NPE (GRAILS-7471)
Merge branch 'master' into production