Merge remote-tracking branch 'upstream/master' into delete-legacy-promotion

Conflicts:
	app/models/product.rb
	app/views/systems/_edit.html.haml