Upgrade to Spring Framework 4.0.0.BUILD-SNAPSHOT