Merge branch 'staging' into server-refactor

# Conflicts:
#	Torch.Server/Torch.Server.csproj
#	Torch/TorchBase.cs

Torch.Server/TorchServer.cs

@@ -30,6 +30,7 @@ using VRage.Library;
 using VRage.ObjectBuilders;
 using VRage.Plugins;
 using VRage.Utils;
+
 #pragma warning disable 618
 
 namespace Torch.Server
@@ -190,7 +191,8 @@ namespace Torch.Server
             if (!mre.WaitOne(TimeSpan.FromSeconds(Instance.Config.TickTimeout)))
             {
                 var mainThread = MySandboxGame.Static.UpdateThread;
-                mainThread.Suspend();
+                if (mainThread.IsAlive)
+                    mainThread.Suspend();
                 var stackTrace = new StackTrace(mainThread, true);
                 throw new TimeoutException($"Server watchdog detected that the server was frozen for at least {((TorchServer)state).Config.TickTimeout} seconds.\n{stackTrace}");
             }