prep support for https://gitlab.com/gitlab-org/gitlab-ce/issues/483
Merge pull request #24 from bitsofinfo/master

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