diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index d65e528b7b..9d68a14cce 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1335,6 +1335,20 @@ func Test_using_freed_memory()
   call test_garbagecollect_now()
 endfunc
 
+func Test_collapse_buffers()
+  if !executable('cat')
+    return
+  endif
+  sp test_channel.vim
+  let g:linecount = line('$')
+  close
+  split testout
+  1,$delete
+  call job_start('cat test_channel.vim', {'out_io': 'buffer', 'out_name': 'testout'})
+  call s:waitFor('line("$") > g:linecount')
+  call assert_true(line('$') > g:linecount)
+  bwipe!
+endfunc
 
 
 " Uncomment this to see what happens, output is in src/testdir/channellog.
diff --git a/src/version.c b/src/version.c
index 1acd1e4cb6..dfeee72569 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1916,
 /**/
     1915,
 /**/