Merge remote-tracking branch 'remotes/upstream/master' into Branch_f54a0dbcc7100ba00c396f2d422e1b4ebfcb5571

Conflicts:
	themes/default/templates/doc.mtt
Merge branch 'Branch_f54a0dbcc7100ba00c396f2d422e1b4ebfcb5571' into throws

Conflicts:
	themes/default/templates/doc.mtt