Merge branch 'develop' into 'master'

Regular merge of Develop

See merge request !28
2 jobs for master in 1 minute and 21 seconds (queued for 3 minutes and 32 seconds)