#90
Merge pull request #92 from alain-andre/2-3-stable

Fix #90.

Ports a fix from Spree that is not present in our 2-3-stable branch.