Merge branch 'master' into develop
Merge branch 'spell-database-populater' into develop
Merge branch 'develop'