Merge branch 'develop' into 'master'

Develop

See merge request !76
3 jobs for master in 1 minute and 15 seconds (queued for 6 seconds)