For Spree >= 2.1