[#48656467] midway
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/menu/tpl/sitemap.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/menu/tpl/sitemap.html