Merge branch 'develop' into 'master'

Regular merge of develop

See merge request R3.training/git.practice!27
1 job for master
Status Job ID Name Coverage
  External
failed jenkins