Adapt to changes made in regard to spree/spree issues #2851 and #3064
Adapt to changes made in regard to spree/spree#2851 and spree/spree#3064
Merge pull request #8 from paul-at/master

Fix for breaking changes in spree