Merge branch 'master' into dev/SE-216
SE-216: Upgrade Spring to version 3.2.2
Merge branch 'master' into dev/SE-216
Merge branch 'dev/SE-216' into release/2.6.3rc