NEMO-1838 Merge branch '2-0-stable' into 2-2-nemo-stable

Conflicts:
	Gemfile
	README.md
	app/models/spree/gateway/pay_pal_express.rb
	spec/models/pay_pal_express_spec.rb
	spec/spec_helper.rb