spree/spree — pull request #2943 by msevestre (2013-04-27 00:14:06+00:00)
Title: Same as #2933 but for master

I haven't run the tests locally. Hopefully nothing breaks with this few changes...
Cheers