upgrade to spring 3.2.3
merge