hand merge from https://github.com/janis-veinbergs/Installation-guide-for-GitLab6-on-Freebsd/commit/bb9d73f3146393fdaf4e6a0233a62195c17e121d