Automatic merge of gitlab-org/gitlab master
GitLab Bot authored
bfed9bca