Probably a huge speed increase when many players are on.
Merge branch 'master' into refactor