1838

From now on, we will use 2-2-nemo-stable as the branch that has our modifications instead of modifying 2-2-stable, which comes from Spree.

Because it's a merge into a previously-unused branch, feel free to do the merge once the code review is approved.