Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !31
2 jobs for master in 1 minute and 29 seconds (queued for 3 seconds)