Merge branch 'daley', remote-tracking branch 'origin'
Fix runtime error when accessing class loader context from spring context adapter