CE upstream - 2018-02-02 12:59 UTC

Closes gitaly#970 and gitlab-ce#41595

See merge request gitlab-org/gitlab-ee!4360