updated for spree-2.1