gemspec >= 1.1.1
display_price
Merge remote-tracking branch 'origin/1-3-stable' into 1-3-stable

Conflicts:
	spree_variant_options.gemspec