diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 37dfd25..f88cba0 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -252,6 +252,12 @@
 
 func Test_communicate_ipv6()
   CheckIPv6
+
+  " FIXME: this test is very flaky on MS-Windows with the GUI
+  if has('gui_running') && has('win32')
+    throw 'Skipped: test is very flaky with MS-Windows in GUI'
+  endif
+
   call Test_communicate()
 endfunc
 
diff --git a/src/version.c b/src/version.c
index fb76c39..30db741 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3131,
+/**/
     3130,
 /**/
     3129,