Manual merge of pull request #199
Merge pull request #200 from thogil/internal-player-merge-june

Manual merge of pull request #199