Merge branch 'develop' into 'master'

Develop

See merge request !74
3 jobs for master in 1 minute and 41 seconds