Backport #696 to 6.x#837

picandocodigo merged 2 commits intoelastic:6.xelastic/elasticsearch-ruby:6.xfrom

misdoro:backport_696_to_6xmisdoro/elasticsearch-ruby:backport_696_to_6xCopy head branch name to clipboard