Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !19
4 jobs for master in 1 minute and 15 seconds