Attempted to fix protocolblocker kicking players too early.
Attempted to fix protocolblocker kicking players too early.
Merge origin/master