Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/school/courses!62
2 jobs for master in 2 minutes and 36 seconds
latest
Status Name Job ID Coverage
  Deploy
passed pages #135372

00:02:36

passed pages:deploy

00:00:03