Merge branch 'master' into 394800-spring-framework-3.2-support