Update request.rb
Merge in safely
Update tests