Upgrade to spring 4.1