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

Conflicts:
	installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql

diff --cc C4/Auth.pm
Simple merge

diff --cc C4/Output.pm
Simple merge

diff --cc installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
Simple merge

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
index 37d224f,af69408..b28fa36
--- 1/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
--- 2/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
+++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_full_optimal_for_install_only.sql
@@@ -352,3 -352,4 +352,4 @@@ INSERT INTO `systempreferences` (variab
  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');
 -INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');
++INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('TraceSubjectSubdivisions', '0', 'Create searches on all subdivisions for subject tracings.','1','YesNo');