Syncing with grails2.4 branch