prep support for https://gitlab.com/gitlab-org/gitlab-ce/issues/483