Added a unregister player to the proper place. This was forgotten during the port.
Merge remote-tracking branch 'origin/1.6.1' into 1.6.1