Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !21
2 jobs for master in 1 minute and 17 seconds (queued for 1 second)