2-1-stable branch for spree-2.1 and rails 4 compatibility