Single commit squash of all changes for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10878

It's needed due to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10777 being merged with squash.