Upgrades to spring 4.1.1