Merge first: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17968
Related:
Part of gitlab-com/www-gitlab-com#2013 (closed)