Gitlab.com uses special packages, build them first
Merge branch 'gitlab.com-packages' into 'master'

Gitlab.com uses special packages, build them first

See merge request !1255