Merge branch 'master' into 'master'

Update configuration for new CI set up

See merge request !3
2 jobs for master in 51 seconds (queued for 4 seconds)