Fixed position and seesaw messages not being treated as spectator messages.
Merge branch 'master' into keep-going