Merge pull request #1 from spring-projects/master

Update from master