added a missing resolve parameter that prevented changePaymentMethod from working
Merge remote-tracking branch 'origin/master'