Merge branch 'master' into 'develop'

# Conflicts:
#   tests/test_nbcourse.py
1 job for develop in 1 minute and 47 seconds (queued for 41 seconds)
Status Job ID Name Coverage
  Test
passed #30173
docker
test

00:01:47