Merge remote branch 'kc/master' into new/enh/bug_5917

Conflicts:
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
	installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql

diff --cc C4/Auth.pm
Simple merge

diff --cc installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
index 38c560a,d05b827..71560a6
--- 1/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
--- 2/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
+++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
@@@ -297,3 -297,6 +297,5 @@@ INSERT INTO `systempreferences` (variab
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('maxRecordsForFacets', '20', NULL, NULL, 'Integer');
  INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('FacetLabelTruncationLength',20,'Specify the facet max length in OPAC',NULL,'Integer');
  INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('AllowPurchaseSuggestionBranchChoice', 0, 'Allow user to choose branch when making a purchase suggestion','1','YesNo');
 -
+ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the OPAC','','free');
+ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('IntranetFavicon','','Enter a complete URL to an image to replace the default Koha favicon on the Staff client','','free');

diff --cc installer/data/mysql/pl-PL/mandatory/sysprefs.sql
Simple merge

diff --cc installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
Simple merge

diff --cc koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
Simple merge