Merge branch 'master' into spring-mesh2