changes to spree 2-1-stable