Merge branch 'master' into 'develop'

# Conflicts:
#   README.md
1 job for develop in 1 minute and 56 seconds (queued for 13 seconds)
Status Job ID Name Coverage
  Test
passed #28366
docker
test

00:01:56