Merge branch 'hotfix' into develop
class player replaced by a hash