Merge branch 'CI' into 'master'

CI

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