Update for changes in Spree 2.4.0 beta