Merge branch 'master' into dev

Source commit: 254124fbf4b24a96d635012bbdf2e34353c7838d

source/core/FileMasks.cpp

@@ -222,7 +222,7 @@ UnicodeString __fastcall TFileMasks::ComposeMaskStr(
 
   // For directories, the above will add slash at the end of masks,
   // breaking size and time masks and thus circumverting their validation.
-  // This performes ad hoc validation to cover the scenario.
+  // This performs ad hoc validation to cover the scenario.
   // For files this makes no difference, but no harm either
   TFileMasks Temp(Directory ? 1 : 0);
   Temp = ResultNoDirMask;

source/forms/Login.cpp

@@ -1446,7 +1446,7 @@ void __fastcall TLoginDialog::SaveDataList(TList * DataList)
   // Normally we would call this from Execute,
   // but at that point the windows is already hidden.
   // Cloning session data may pop up master password dialog:
-  // - if it happens between closing and destroyiong login dialog
+  // - if it happens between closing and destroying login dialog
   //   the next window will appear in background for some reason
   // - and its actually even nicer when master password dialog pops up over
   //   the login dialog