Merge branch 'local_grails'