Pulling from https://gitlab.com/gitlab-org/gitlab-ce/commit/83106427c84b84f45a540c6defc89764d97e1716
Related to gitlab-org/distribution/team-tasks#78 (closed) Related to release-tools!526 (merged)