Merge branch 'dev' into 'master'

Dev

See merge request !5
2 jobs for master in 1 minute and 48 seconds