Merge branch 'jk/add-e-kill-editor' into maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 40f88416789f90ad3379900b6cdff14b08ac8e49..c4a6631fc0458faaa52ed57dcaef7eea5def20df 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.4.0-rc1
+DEF_VER=v2.4.2
 
 LF='
 '