Merge with stable

diff --cc Src/Merge.vcxproj
index 47b1cdb,7b0cafc..70f3670
--- 1/Src/Merge.vcxproj
--- 2/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@@ -1484,9 -1761,8 +1772,10 @@@
        <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeRelease|x64'">NotUsing</PrecompiledHeader>\r
        <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>\r
        <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='UnicodeDebug|x64'">NotUsing</PrecompiledHeader>\r
+       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug Unicode + Code Analysis|x64'">NotUsing</PrecompiledHeader>\r
      </ClCompile>\r
 +    <ClCompile Include="Common\SplitterWndEx.cpp">\r
 +    </ClCompile>\r
      <ClCompile Include="Common\StatLink.cpp">\r
      </ClCompile>\r
      <ClCompile Include="StdAfx.cpp">\r

diff --cc Src/MergeCmdLineInfo.cpp
Simple merge

diff --cc Src/MergeDoc.cpp
Simple merge

diff --cc Src/Plugins.cpp
Simple merge

diff --cc Src/TempFile.cpp
index 89f25ea,511f37a..2dd903c
--- 1/Src/TempFile.cpp
--- 2/Src/TempFile.cpp
+++ b/Src/TempFile.cpp
@@@ -177,23 -177,12 +177,19 @@@ static bool CleanupWMtempfolder(const v
                        tempfolderPID = foldername.substr(_tcslen(TempFolderPrefix));
  
                        // Check if this instance of WM is still running
 -                      if (!WMrunning(processIDs, _ttoi (tempfolderPID.c_str())))
 +                      try
 +                      {
 +                              int pid = string_stoi(tempfolderPID);
 +                              if (!WMrunning(processIDs, pid))
 +                              {
 +                                      tempfolderPID = paths_ConcatPath(paths_GetParentPath(pattern), ff.cFileName); 
 +                                      if (res = ClearTempfolder(tempfolderPID))
-                                       {
-                                               if (!res)
-                                                       break;
 +                                              bok = !!FindNextFile(h, &ff) ;
-                                       }
 +                                      continue;
 +                              }
 +                      }
 +                      catch (...)
                        {
 -                              tempfolderPID = paths_ConcatPath(paths_GetParentPath(pattern), ff.cFileName); 
 -                              if (res = ClearTempfolder(tempfolderPID))
 -                                      bok = !!FindNextFile(h, &ff) ;
 -                              continue;
                        }
                }
                bok = !!FindNextFile(h, &ff) ;

diff --cc Src/VSSHelper.cpp
Simple merge