Merge pull request #1 from spree/2-3-stable

2 3 stable