FIX: pull request copied from https://github.com/radar/spree/commit/2ccbd53ad0ccdcea80fd65a931ed9268dd1b4e2a