Working under 2.3.1
Merge branch 'refs/heads/grails_2_3_1_migration' into grail_2_3_1_test
Fix for the layoutResources issue that was repeated in the logs.
Merge branch 'refs/heads/grail_2_3_1_test' into dev