Upgrade to Spring Security 3.2