Grails updated to 2.3.6
Merge branch 'master' into merge-polling-with-master
Merge pull request #313 from jfederico/merge-polling-with-master

Merge polling with master