Merge branch 'master', remote branch 'origin/master'
minor update of models.py db settings to utf8mb4