new branch 2-2-stable
Merge branch '2-2-stable' of github.com:RuanShan/spree_alipay into 2-2-stable