New gem
Fixes for Spree 2.0.x