Temporarily upgrade to patched local spree for payment_status update
Merge branch 'staging'