Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !162
4 jobs for master in 2 minutes and 9 seconds (queued for 1 second)