Fixes payment status & information of cancelled payments.
Merge branch 'master' into edit-profile