Upgrade to Spring 4.0.5

Closes #891