User renamed to Player
Merge commit '80c16178830de463f6cea8f9e5576916191cd758'