Merge pull request from spring-projects/master