Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	cms/modules/datasource/classes/controller/system/datasource.php
	cms/modules/kodicms/classes/kodicms/controller/system/security.php
	cms/plugins/archive/i18n/ru.php
Merge branch 'dev' into hybrid