Merge conflicts resolved
Merge branch 'develop' of github.com:DABSquared/gitlab-plugin into develop