Merge pull request #2844 from totten/4.4-handlePaymentNotification