Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !92
5 jobs for master in 3 minutes and 45 seconds