WIP - Upgrade for spree 2.0-stable