Merge branch 'master' into 'add-account-amount'

# Conflicts:
#   locale/fr/LC_MESSAGES/django.po
2 jobs for add-account-amount in 36 minutes and 3 seconds (queued for 9 seconds)
latest
Status Job ID Name Coverage
  Test
passed #2915
black

00:02:49

passed #2914
test

00:36:03

63.0%