Upgrade to Spring 4.0.4