It merges https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1233 https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1278 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8839