Fixes for Spree 2.0 final.
Merge remote-tracking branch 'jdutil/master' into try-merge