Merge branch 'maint-2.7' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 4e9450b3ae0c403820f0166435c52c4ea74e7451..596965a4de6c3d965a6967a2ed94eb79eb762b5f 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.8.0
+DEF_VER=v2.8.3
 
 LF='
 '