Merge branch 'serverchange' into 'testing'

Update .gitlab-ci.yml

See merge request !59
18 jobs for testing in 3 seconds (queued for 3 seconds)