Merge branch 'master' into 'master'

Try different CI config

See merge request !4
3 jobs for master in 1 minute and 19 seconds (queued for 3 seconds)