Merge branch 'develop' into 'master'

Develop

See merge request !76
2 jobs for master in 29 seconds (queued for 3 seconds)