Merge remote-tracking branch 'upstream/1.6' into 1.6

Conflicts:
	modules/crossselling
	modules/socialsharing