Merge remote-tracking branch 'upstream/master'
Gitlab security update
Merge pull request #21 from g3d/bugfix/gitlab_security_update

Gitlab security update