change current_user to spree_current_user
Merge remote-tracking branch 'github/1-3-stable' into 1-3-stable