Merge branch 'master' into issue-2193

sql-schema/108.sql

@@ -0,0 +1 @@
+INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('email_html', 'false', 'false', 'Send HTML emails', 'alerting',0,'general',0,'0','0');

sql-schema/109.sql

@@ -0,0 +1,5 @@
+CREATE TABLE tmp_table LIKE config;
+ALTER IGNORE TABLE tmp_table ADD UNIQUE INDEX uniqueindex_configname (config_name);
+INSERT IGNORE INTO tmp_table SELECT * FROM config;
+DROP TABLE config;
+RENAME TABLE tmp_table TO config;