An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292
Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667
cc/ @dzaporozhets @rspeicher @JobV