Merge branch 'develop' into 'master'

Develop

See merge request !30
2 jobs for master in 5 minutes and 34 seconds (queued for 2 seconds)