Merge branch 'testing' into 'docker_changes'

# Conflicts:
#   .dockerignore
#   .gitignore
1 job for docker_changes in 2 minutes and 39 seconds (queued for 8 seconds)