Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3/school/git.slides!39
2 jobs for master in 1 minute and 43 seconds