Merge branch 'master' into dev

# Conflicts:
#	source/WinSCP.cbproj

Source commit: f6a72338e5cd02e8e142695a0fcb91b139e4528a

dotnet/properties/AssemblyInfo.cs

@@ -31,7 +31,7 @@ namespace WinSCP
     {
         public const string UndefinedProductVersion = "9.9.9.9";
 
-        public const string Version = "1.5.3.0";
+        public const string Version = "1.5.4.0";
         public const string ProductVersion = "5.14.0.0";
     }
 }