Add latest changes from gitlab-org/gitlab@master

[skip secret push protection]