Bug #25419
Merge remote-tracking branch 'origin/master'

Conflicts:
	trunk/assets/frontend/css/tpl/tpl_1.css
	trunk/assets/frontend/css/tpl/tpl_1.less
	trunk/assets/frontend/css/tpl/tpl_2.css