Update to spring 4.1