Merge branch 'develop' into 'master'

Develop

See merge request !82
2 jobs for master in 40 seconds (queued for 2 seconds)