Upgrading to Spring 4.1.0