Merge branch 'master' into 'specific_context_module'

# Conflicts:
#   app/utils.py
#   tests/unit/app_conf_test.py
2 jobs for !442 with specific_context_module in 47 minutes and 11 seconds (queued for 2 seconds)
latest merge request