bringing in spree-core fixes