Combine
Merge branch 'master' of https://github.com/leizhiyuan/spring-framework