Merge branch 'develop' into 'master'

Develop

See merge request !89
5 jobs for master in 4 minutes and 49 seconds (queued for 1 second)