Adding the player-shuffle branch into master.

I have confirmed that this patch does help with the "relog" issue.  Prplz and LK also are using it now and have confirmed it works as intended.