Merge branch 'master' into dev

Source commit: f9353cb48881a18d12513e327bae20dabe7e5586

source/core/SecureShell.cpp

@@ -2106,7 +2106,7 @@ void __fastcall TSecureShell::GetRealHost(UnicodeString & Host, int & Port)
 {
   if (FSessionData->Tunnel)
   {
-    // Not that we set the CONF_loghost, the hostname is correct already
+    // Now that we set the CONF_loghost, the hostname is correct already
     Host = FSessionData->OrigHostName;
     Port = FSessionData->OrigPortNumber;
   }