Upgrade to Spring 4.0.4

Fixes gh-759