Merge branch 'spell-database-populater' into develop