Merge branch 'develop' into 'master'

Develop

See merge request !100
6 jobs for master in 31 minutes and 57 seconds (queued for 7 seconds)