Preliminary support for multiple players.
Merge remote-tracking branch 'origin/master'