Make compatible with Spree 1.3.
Merges spree/1-3-stable