Merge branch 'develop' into 'master'

Develop

See merge request !18
3 jobs for master in 1 minute and 32 seconds