1838

:bomb: all comments of the form "# TODO UPGRADE" are temporary, and must be addressed before merge!

From now on, we will use the 2-2-nemo-stable branch instead of making changes to 2-2-stable, which comes from Spree.

Because we are merging into a previously-unused branch, feel free to do the merge once the code changes are approved (and once the TODO UPGRADE comments are addressed).