Merge branch 'dev' into 'master'

Dev

See merge request !8
2 jobs for master in 2 minutes and 1 second (queued for 13 seconds)