Typo
Merge branch '2-0-stable' of https://github.com/matthew-jiang/spree into 2-0-stable

merging