merge from master
oops, was always showing my own name, not the player's
Merge remote-tracking branch 'refs/remotes/local/localmaster'