Merge branch 'master' into dev

# Conflicts:
#	source/WinSCP.cbproj

Source commit: ae6912d2be59147797986bfcbda64569d64fe083

source/forms/CustomScpExplorer.cpp

@@ -11083,6 +11083,11 @@ void __fastcall TCustomScpExplorerForm::DirViewGetItemColor(
 
   TCustomDirView * DirView = DebugNotNull(dynamic_cast<TCustomDirView *>(Sender));
   bool Local = (dynamic_cast<TUnixDirView *>(DirView) == NULL);
+  // TUnixDirView::ItemFullFileName returns trailing backslash for directories, what filemask cannot deal with
+  if (!Local && Directory)
+  {
+    FileName = UnixExcludeTrailingBackslash(FileName);
+  }
   for (TFileColorData::TList::const_iterator Iter = FFileColors.begin(); Iter != FFileColors.end(); Iter++)
   {
     bool ImplicitMatch;