Merge branch 'master' into 'och'

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

00:02:08

failed #3096
test

00:06:48

 
Name Stage Failure
failed
test Test There is an unknown failure, please try again
/builds/ae/Sith/locale/fr/LC_MESSAGES/django.po:4762: keyword "locale" unknown
/builds/ae/Sith/locale/fr/LC_MESSAGES/django.po:4767:2: syntax error
/builds/ae/Sith/locale/fr/LC_MESSAGES/django.po:4767: keyword "locale" unknown
/builds/ae/Sith/locale/fr/LC_MESSAGES/django.po:4768: keyword "HEAD" unknown
/builds/ae/Sith/locale/fr/LC_MESSAGES/django.po:4769: keyword "HEAD" unknown
msgfmt: too many errors, aborting
CommandError: compilemessages generated one or more errors.
processing file django.po in /builds/ae/Sith/locale/fr/LC_MESSAGES
ERROR: Job failed: exit code 1