Add latest changes from gitlab-org/gitlab@master
GitLab Bot authored
cc6b394a