Catalog/Product list changes
Merge remote-tracking branch 'origin/1.1.9_mv' into 1.1.9_mv

Conflicts:
	public_html/core/lib/vendor.php