Merge branch 'develop' into 'master'

Update .gitlab-ci.yml

See merge request !23
1 job for master in 2 seconds (queued for 4 seconds)