2 0 stable

Without those changes payment will fail with spree stable 2.0.1.

cherry-picked fixes to order show and session state issues