Merge branch 'develop' into 'master'

Develop

See merge request !87
6 jobs for master in 26 minutes and 55 seconds (queued for 1 second)