lib-spring: repackage
Merge remote-tracking branch 'base/master'