Rolling back Spring. Need to keep things simple for now. Maybe later...
Merge remote-tracking branch 'origin/master'