Upgrade to Spring Framework 4.1.0