bug fix
Merge branch '0806_add_player_wiki'