Fix for issue #933 - special stage tokens should divert player until after the...

See merge request !1910