Changes for Spree 2.1.