Set paymentGatewayType to 'TRUST COMMERCE'
Merge remote-tracking branch 'origin/master'