Merge branch 'testing' into 'patch-1'

# Conflicts:
#   config/initializers/cors.rb
1 job for patch-1 in 2 minutes and 42 seconds (queued for 7 seconds)
Status Job ID Name Coverage
  Build
passed #24400
docker build
build

00:02:42