Upgrade to Spring 4
Merge remote-tracking branch 'origin/2.1.x'