Upgrade to spring 4.0.1