Merge branch 'maint-2.7' into maint-2.8

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