Handle situation where there's no spirit object, e.g. scheduling
Fix icons shown to coordinators
Merge remote-tracking branch 'upstream/master'