Merge branch 'master' into 'boundary-tests'

# Conflicts:
#   .gitlab-ci.yml
#   backend/secfit/secfit/settings.py
#   frontend/Procfile
1 job for boundary-tests in 51 seconds (queued for 1 minute and 18 seconds)