Configuration
Updated
Merge branch 'master' of https://github.com/jjayaraman/spring