Make gem compatible with Spree Core 1.3.0 (one big commit for now)