Upgrade to Spring 4.0.0.M3