fix #1769
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop