Sync changes from spree/spree:frontend up to 2c057cf.