Really fixed player creation this time...
Merge branch 'dev'