Merge branch 'master' into dev

# Conflicts:
#	source/WinSCP.cbproj

Source commit: f40e6151dfb9798f4c42b379166b79ce63ec382a

dotnet/properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ namespace WinSCP
     {
         public const string UndefinedProductVersion = "9.9.9.9";
 
-        public const string Version = "1.4.0.0";
+        public const string Version = "1.4.1.0";
         public const string ProductVersion = "5.12.0.0";
     }
 }

source/Console.cbproj

@@ -43,11 +43,11 @@
 		<ProjectType>CppConsoleApplication</ProjectType>
 		<SanitizedProjectName>Console</SanitizedProjectName>
 		<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
-		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Console interface for WinSCP;FileVersion=4.5.1.0;InternalName=console;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.com;ProductName=WinSCP;ProductVersion=5.12.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
+		<VerInfo_Keys>CompanyName=Martin Prikryl;FileDescription=Console interface for WinSCP;FileVersion=4.5.2.0;InternalName=console;LegalCopyright=(c) 2000-2018 Martin Prikryl;LegalTrademarks=;OriginalFilename=winscp.com;ProductName=WinSCP;ProductVersion=5.12.0.0;ReleaseType=stable;WWW=https://winscp.net/</VerInfo_Keys>
 		<VerInfo_Locale>1033</VerInfo_Locale>
 		<VerInfo_MajorVer>4</VerInfo_MajorVer>
 		<VerInfo_MinorVer>5</VerInfo_MinorVer>
-		<VerInfo_Release>1</VerInfo_Release>
+		<VerInfo_Release>2</VerInfo_Release>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Cfg_1)'!=''">
 		<BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>

source/filezilla/FtpListResult.cpp

@@ -1458,7 +1458,7 @@ BOOL CFtpListResult::parseAsMlsd(const char *line, const int linelen, t_director
   copyStr(fileName, 0, line + pos, linelen - pos, true);
   if (mlst)
   {
-    // do not try to detect path type, assume a standart *nix syntax + do not trim
+    // do not try to detect path type, assume a standard *nix syntax + do not trim
     CServerPath path(fileName, FZ_SERVERTYPE_FTP, false);
     direntry.name = path.GetLastSegment();
     if (direntry.name.IsEmpty())