temp-fix #3429
Merge branch 'release' of github.com:spring/spring into release