EE-Port of gitlab-ce!19171 (!5868) · Merge requests · GitLab.org / GitLab · GitLab

Lukas 'ai-pi' Eipert requested to merge ee-leipert-backport-bs4-merge-conflict into master May 28, 2018

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19171