All of the functional changes made in this commit came from a future version of Spree: 8a3a80b08a
8a3a80b08a