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 Job ID Name Coverage
  Deploy
passed #135372
pages

00:02:36

passed pages:deploy

00:00:03