Merge branch 'develop' into 'master'

Regular merge of develop

See merge request !76
2 jobs for master in 3 minutes and 56 seconds (queued for 1 second)