Merge pull request #240 from bmeurant/master

move to Spring 4.0.2