https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1559 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/1558