Syncing with grails2.4 branch
Merge pull request #108 from sat01a/master

Syncing with grails2.4 branch