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

# Conflicts:
#	SetVersion.cmd
#	Translations/WinMerge/Russian.po
#	Version.h

diff --cc SetVersion.cmd
index ecdad2b,a5323e8..84b92c2
--- 1/SetVersion.cmd
--- 2/SetVersion.cmd
+++ b/SetVersion.cmd
@@@ -1,8 -1,8 +1,8 @@@
  set MAJOR=2
  set MINOR=16
- set REVISION=4
- set PATCHLEVEL=13
- set STRPRIVATEBUILD="jp-13"
 -set REVISION=7
 -set PATCHLEVEL=0
 -set STRPRIVATEBUILD=""
++set REVISION=6
++set PATCHLEVEL=1
++set STRPRIVATEBUILD="jp-1"
  
  set RCVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%
  rem set STRVER=%MAJOR%.%MINOR%.%REVISION%.%PATCHLEVEL%

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

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

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

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

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

diff --cc Version.h
index 63cb4b3,b650342..02a7534
--- 1/Version.h
--- 2/Version.h
+++ b/Version.h
@@@ -1,5 -1,5 +1,5 @@@
 -#define FILEVER        2,16,7,0\r
 -#define PRODUCTVER     2,16,7,0\r
 -#define STRFILEVER     "2.16.7.0"\r
 -#define STRPRODUCTVER  "2.16.7.0"\r
 -#define STRPRIVATEBUILD ""\r
 +#define FILEVER        2,16,4,13\r
 +#define PRODUCTVER     2,16,4,13\r
- #define STRFILEVER     "2.16.4.13"\r
- #define STRPRODUCTVER  "2.16.4.13"\r
- #define STRPRIVATEBUILD "jp-13"\r
++#define STRFILEVER     "2.16.6.1"\r
++#define STRPRODUCTVER  "2.16.6.1"\r
++#define STRPRIVATEBUILD "jp-1"\r