Update from spree/spree 284dd45..9bf7a7a.

Include changes from:
6731819, a8c6b00, 6f52dc3, 8bd2ece, cef0603, f689843, 344ca1d, d375f79, a1678bc, 47cc80f, 3582b73, 2469735, 1a4e9a0, 38ee52e, 2f13ae6, 570c3e9, d314b0d, 80c461a, 2a530f1, 376db76, 71af357, 1af6b19, d11888d, f689843, 25f5fb3, 209c981