Updated to work with Spree edge (2.3.beta).