Updates to support Spree 1.3