Merge branch 'develop' into 'master'

Develop

See merge request !86
5 jobs for master in 3 minutes and 17 seconds