fix for spree 2.0.9
Merge remote-tracking branch 'origin/2-0-stable' into 2-0-stable
fix for spree 2.0.9