Master failures

I did merge https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019

However, there are test failures for Ruby 2.1: https://gitlab.com/gitlab-org/gitlab-ce/builds/5246591 https://gitlab.com/gitlab-org/gitlab-ce/builds/5246592

@godfat Can you fix that?