Dropped Spring support to reduce bloat.
Merge remote-tracking branch 'origin/master'