Upgraded to Spring 4.0.4.BUILD-SNAPSHOT for a fix to SPR-11634