Merge branch 'gitlab_ci' into 'master'

Update GitLab CI

See merge request !1
2 jobs for master in 9 seconds (queued for 3 seconds)