Backport two commits from EE (!2424) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Douwe Maan requested to merge backport-ee into master Jan 14, 2016

Backport part of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/110