Merge branch 'develop' into 'master'

Develop

See merge request !87
5 jobs for master in 3 minutes and 28 seconds (queued for 1 second)