Merge pull request #1 from spring-projects/master

merge commits on Aug 20, 2014