Implements https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2894#note_3845158
cc @DouweM @grzesiek