Upgrade to Spring 3.1.2. Fixes #2