Bug #24411
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	themes/dpla/common/header.php
Bug #24154
Merge pull request #10 from mekhanikov/develop

Bug #24411