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

prep support for https://gitlab.com/gitlab-org/gitlab-ce/issues/483

No point in merging this until https://gitlab.com/gitlab-org/gitlab-ce/issues/483 is merged. However it should not hurt anything as the way 483 is coded it just won't do anything if passed