merge spring-framework

merge spring3.2.x from spring-projects/spring-framework