Update to Spring framework 4.0.7

Fixes gh-1488