Sync grails with upstream and enable it.
Merge pull request #576 from pyhalov/grails

Sync grails with upstream and enable it.