Fix #13 - changes not being merged on grails 2.2.x