Initial update to support Spree > 1.2.0