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

# Conflicts:
#	SetVersion.cmd
#	Version.h

diff --cc SetVersion.cmd
index c9d02ad,004110b..8a88d28
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
 -set REVISION=25
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
 +set REVISION=24
- set PATCHLEVEL=2
- set STRPRIVATEBUILD="jp-2"
++set PATCHLEVEL=3
++set STRPRIVATEBUILD="jp-3"
  
  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 ab64b1d,c14f8f0..8a55e4b
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
- #define FILEVER        2,16,24,2\r
- #define PRODUCTVER     2,16,24,2\r
- #define STRFILEVER     "2.16.24.2"\r
- #define STRPRODUCTVER  "2.16.24.2"\r
- #define STRPRIVATEBUILD "jp-2"\r
 -#define FILEVER        2,16,25,0\r
 -#define PRODUCTVER     2,16,25,0\r
 -#define STRFILEVER     "2.16.25.0"\r
 -#define STRPRODUCTVER  "2.16.25.0"\r
 -#define STRPRIVATEBUILD ""\r
++#define FILEVER        2,16,24,3\r
++#define PRODUCTVER     2,16,24,3\r
++#define STRFILEVER     "2.16.24.3"\r
++#define STRPRODUCTVER  "2.16.24.3"\r
++#define STRPRIVATEBUILD "jp-3"\r