Latest Spree 2-3-Stable Into Our Fork

Merge the latest features and fixes of 2-3-stable into our version of Spree 2-3-dev.