Merge pull request #4806 from kwvanderlinde/bugfix/missing-local-player

Merge pull request #4806 from kwvanderlinde/bugfix/missing-local-player #131