Merge branch 'master' into 'KevinCodeReview'

# Conflicts:
#   backend/secfit/comments/permissions.py