small fixes
small fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.theme
Merge remote-tracking branch 'origin/master' into 3.12