Changes required for spree 2.1 / rails 4