Spring update to 4.0.4