Upgrade to Spring 4.0.5

Closes #891
Merge branch '1.0.x'