GRAILS-10384 'fix'
Merge branch 'master' of github.com:SpringSource/spring-loaded