Pending merge of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19055 and https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/5783.
See omnibus-gitlab#2588 (closed).