Upgrade to Spring 3.2.5