ignore samples/payment_method.rb
Merge remote-tracking branch 'origin/2-0-stable' into 2-0-stable