Closes #4361
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop