Merge remote-tracking branch 'origin/master'

Conflicts:
	app/design/frontend/ultimo/default/template/catalog/product/list_featured_slider.phtml