Merge branch 'dev' into 'master'

Dev

See merge request !10
2 jobs for master in 1 minute and 41 seconds (queued for 13 seconds)