PaymentMethod add v3 support.
Merge remote-tracking branch 'upstream/master' into 3.0-extras