Merge branch 'master' into 'audit'

# Conflicts:
#   Dockerfile
1 job for audit in 25 seconds (queued for 2 seconds)