Merge branch 'develop' into 'master'

Develop

See merge request !22
2 jobs for master in 1 minute and 17 seconds