Merge upstream

TGServerService/ServerInstance/DreamDaemon.cs

@@ -343,7 +343,7 @@ namespace TGServerService
 					var Now = DateTime.Now;
 					lock (watchdogLock)
 					{
-						CurrentDDLog = String.Format("{0} {1} Diagnostics.txt", Now.ToLongDateString(), Now.ToLongTimeString()).Replace(':', '-');
+						CurrentDDLog = DateTime.UtcNow.ToString("yyyy-MM-ddTHH-mm-ssZ");
 						WriteCurrentDDLog("Starting monitoring...");
 					}
 					pcpu = new PerformanceCounter("Process", "% Processor Time", Proc.ProcessName, true);

TGServerService/ServerInstance/ServerInstance.cs

@@ -24,11 +24,11 @@ namespace TGServerService
 		/// <summary>
 		/// The configuration settings for the instance
 		/// </summary>
-		readonly InstanceConfig Config;
+		readonly IInstanceConfig Config;
 		/// <summary>
 		/// Constructs and a <see cref="ServerInstance"/>
 		/// </summary>
-		public ServerInstance(InstanceConfig config, byte logID)
+		public ServerInstance(IInstanceConfig config, byte logID)
 		{
 			LoggingID = logID;
 			Config = config;