Conflicts:
	install/lib/update.lib.php
	install/sql/incremental/upd_0058.sql
	install/tpl/server.ini.master
	interface/lib/classes/remoting_lib.inc.php
	interface/lib/classes/tform.inc.php
	interface/web/admin/form/server_config.tform.php
	interface/web/mail/templates/mail_domain_edit.htm
	server/cron_daily.php
	server/lib/classes/monitor_tools.inc.php
	server/mods-available/monitor_core_module.inc.php
	server/plugins-available/mail_plugin_dkim.inc.php