Adding the player-shuffle branch into master.