Merge branch 'go-get-workaround-nginx' of https://github.com/mattes/gitlabhq into mattes-go-get-workaround-nginx

Conflicts:
	lib/support/nginx/gitlab
	lib/support/nginx/gitlab-ssl