targeting 2.2
Merge pull request #18203 from kyledecot/ruby-2.2

Targeting 2.2