Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3.training/git.slides!26
1 job for master in 4 seconds