Merge branch 'master' into 'och'

# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2 jobs for och in 7 minutes and 2 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #3103
black

00:02:38

failed #3102
test

00:07:02

 
Name Stage Failure
failed
test Test There is an unknown failure, please try again
Connecting signals!
processing file django.po in /builds/ae/Sith/locale/fr/LC_MESSAGES
$ coverage run ./manage.py test
Custom settings failed
Connecting signals!
Creating test database for alias 'default'...
CommandError: Conflicting migrations detected; multiple leaf nodes in the migration graph: (0013_auto_20200827_1636, 0014_auto_20200827_1444 in subscription).
To fix them run 'python manage.py makemigrations --merge'
ERROR: Job failed: exit code 1