Merge branch 'gitlab_ci' into 'master'

Update GitLab CI

See merge request !1
2 jobs for master in 10 seconds (queued for 4 seconds)