Upgrade to Spring 3.1.4