Update master to match 2.4.x changes on spree master