Automatic merge of gitlab-org/gitlab-ce master