fix #4033 (part 3)
Merge branch 'develop' of github.com:spring/spring into develop