Merge remote-tracking branch 'upstream/master' into jp

# Conflicts:
#	Externals/frhed
#	SetVersion.cmd
#	Translations/TranslationsStatus.md
#	Version.h

diff --cc BuildArc.cmd
Simple merge

diff --cc Externals/frhed
index fa70b33,270d4c0..55e1744
--- 1/Externals/frhed
--- 2/Externals/frhed
+++ b/Externals/frhed
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit fa70b33cb3852fc5e46067f7a07a295e10fa483b
 -Subproject commit 270d4c0d679168448690b29d50f1397e0047f5cc
++Subproject commit 55e1744ed4e45919c9152b75a788337436ae4d4b

diff --cc Installer/InnoSetup/WinMergeARM64.is6.iss
Simple merge

diff --cc Installer/InnoSetup/WinMergeX64.is6.iss
Simple merge

diff --cc Installer/InnoSetup/WinMergeX64.iss
Simple merge

diff --cc Installer/InnoSetup/WinMergeX64NonAdmin.iss
Simple merge

diff --cc Installer/InnoSetup/WinMergeX86.iss
Simple merge

diff --cc SetVersion.cmd
index d8425e5,8a05f00..25ed328
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
- set REVISION=18
- set PATCHLEVEL=3
- set STRPRIVATEBUILD="jp-3"
+ set REVISION=20
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
++set PATCHLEVEL=1
++set STRPRIVATEBUILD="jp-1"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/MainFrm.h
Simple merge

diff --cc Src/Merge.rc
Simple merge

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge

diff --cc Translations/WinMerge/Arabic.po
Simple merge

diff --cc Translations/WinMerge/Basque.po
Simple merge

diff --cc Translations/WinMerge/Brazilian.po
Simple merge

diff --cc Translations/WinMerge/Bulgarian.po
Simple merge

diff --cc Translations/WinMerge/Catalan.po
Simple merge

diff --cc Translations/WinMerge/ChineseSimplified.po
Simple merge

diff --cc Translations/WinMerge/ChineseTraditional.po
Simple merge

diff --cc Translations/WinMerge/Corsican.po
Simple merge

diff --cc Translations/WinMerge/Croatian.po
Simple merge

diff --cc Translations/WinMerge/Czech.po
Simple merge

diff --cc Translations/WinMerge/Danish.po
Simple merge

diff --cc Translations/WinMerge/Dutch.po
Simple merge

diff --cc Translations/WinMerge/English.pot
Simple merge

diff --cc Translations/WinMerge/Finnish.po
Simple merge

diff --cc Translations/WinMerge/French.po
Simple merge

diff --cc Translations/WinMerge/Galician.po
Simple merge

diff --cc Translations/WinMerge/German.po
Simple merge

diff --cc Translations/WinMerge/Greek.po
Simple merge

diff --cc Translations/WinMerge/Hungarian.po
Simple merge

diff --cc Translations/WinMerge/Italian.po
Simple merge

diff --cc Translations/WinMerge/Japanese.po
Simple merge

diff --cc Translations/WinMerge/Korean.po
Simple merge

diff --cc Translations/WinMerge/Lithuanian.po
Simple merge

diff --cc Translations/WinMerge/Norwegian.po
Simple merge

diff --cc Translations/WinMerge/Persian.po
Simple merge

diff --cc Translations/WinMerge/Polish.po
Simple merge

diff --cc Translations/WinMerge/Portuguese.po
Simple merge

diff --cc Translations/WinMerge/Romanian.po
Simple merge

diff --cc Translations/WinMerge/Russian.po
Simple merge

diff --cc Translations/WinMerge/Serbian.po
Simple merge

diff --cc Translations/WinMerge/Sinhala.po
Simple merge

diff --cc Translations/WinMerge/Slovak.po
Simple merge

diff --cc Translations/WinMerge/Slovenian.po
Simple merge

diff --cc Translations/WinMerge/Spanish.po
Simple merge

diff --cc Translations/WinMerge/Swedish.po
Simple merge

diff --cc Translations/WinMerge/Turkish.po
Simple merge

diff --cc Translations/WinMerge/Ukrainian.po
Simple merge

diff --cc Version.h
index a306858,fc56fcf..3b9d2ae
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,18,3\r
- #define PRODUCTVER     2,16,18,3\r
- #define STRFILEVER     "2.16.18.3"\r
- #define STRPRODUCTVER  "2.16.18.3"\r
- #define STRPRIVATEBUILD "jp-3"\r
 -#define FILEVER        2,16,20,0\r
 -#define PRODUCTVER     2,16,20,0\r
 -#define STRFILEVER     "2.16.20.0"\r
 -#define STRPRODUCTVER  "2.16.20.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,20,1\r
++#define PRODUCTVER     2,16,20,1\r
++#define STRFILEVER     "2.16.20.1"\r
++#define STRPRODUCTVER  "2.16.20.1"\r
++#define STRPRIVATEBUILD "jp-1"\r