Upgrade Spring to 4.0.7