Add set-immediate shim
Finish objects after actions
Fix reference to principal in routes/web
Merge remote-tracking branch 'upstream/master'