Merge branch 'master' into 'testing'

# Conflicts:
#   backend/secfit/secfit/settings.py
1 job for testing in 29 seconds (queued for 1 second)