diff --git a/src/INSTALLpc.txt b/src/INSTALLpc.txt
index bc1fa36..c77204e 100644
--- a/src/INSTALLpc.txt
+++ b/src/INSTALLpc.txt
@@ -49,7 +49,7 @@
 VS2010, VS2012, VS2013 and VS2015) is straightforward. (These instructions
 should also work for VS 4 and VS 5.)
 
-Using VS C++ 2008 Express is recommended, the binaries build with that run on
+Using VS C++ 2008 Express is recommended, the binaries built with that run on
 nearly all platforms.  Binaries from later versions may not run on Windows 95
 or XP.
 
diff --git a/src/diff.c b/src/diff.c
index 35e37d7..c29e944 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -135,7 +135,7 @@
 	    return;
 	}
 
-    EMSGN(_("E96: Can not diff more than %ld buffers"), DB_COUNT);
+    EMSGN(_("E96: Cannot diff more than %ld buffers"), DB_COUNT);
 }
 
 /*
diff --git a/src/digraph.c b/src/digraph.c
index b17340c..4d86b9c 100644
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -2460,4 +2460,3 @@
 }
 
 #endif /* FEAT_KEYMAP */
-
diff --git a/src/testdir/Makefile b/src/testdir/Makefile
index 129ecaf..5c629ed 100644
--- a/src/testdir/Makefile
+++ b/src/testdir/Makefile
@@ -80,14 +80,14 @@
 	@-/bin/sh -c "sleep .2 > /dev/null 2>&1 || sleep 1"
 	-$(RUN_VIM) $*.in
 
-	# For flaky tests retry one time.
-	@/bin/sh -c "if test -f test.out -a $* = test61; then \
-		  if diff test.out $*.ok; \
-		  then echo flaky test ok first time; \
-		  else rm -rf $*.failed $(RM_ON_RUN); \
-			$(RUN_VIM) $*.in; \
-		  fi \
-		fi"
+	# For flaky tests retry one time.  No tests at the moment.
+	#@/bin/sh -c "if test -f test.out -a $* = test61; then \
+	#	  if diff test.out $*.ok; \
+	#	  then echo flaky test ok first time; \
+	#	  else rm -rf $*.failed $(RM_ON_RUN); \
+	#		$(RUN_VIM) $*.in; \
+	#	  fi \
+	#	fi"
 
 	# Check if the test.out file matches test.ok.
 	@/bin/sh -c "if test -f test.out; then \
diff --git a/src/testdir/test80.in b/src/testdir/test80.in
index 406fb6d..e78e921 100644
--- a/src/testdir/test80.in
+++ b/src/testdir/test80.in
Binary files differ
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 48ab69c..fff9ebd 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1320,7 +1320,7 @@
   1,$delete
   call job_start('cat test_channel.vim', {'out_io': 'buffer', 'out_name': 'testout'})
   call WaitFor('line("$") > g:linecount')
-  call assert_true(line('$') > g:linecount)
+  call assert_inrange(g:linecount + 1, g:linecount + 2, line('$'))
   bwipe!
 endfunc
 
diff --git a/src/version.c b/src/version.c
index 8ef6dec..210c2e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2135,
+/**/
     2134,
 /**/
     2133,
diff --git a/src/xpm/README.txt b/src/xpm/README.txt
index 586de6c..25f3831 100644
--- a/src/xpm/README.txt
+++ b/src/xpm/README.txt
@@ -4,6 +4,10 @@
 Libraries in x86 directory were compiled with MSVC6 and MinGW. Proposed
 commands to compile Vim are:
 
+If you want to build XPM library by yourself, you may want to use the
+following Win32 port:
+https://github.com/koron/libXpm-win32
+
 Any version of MSVC starting from version 6.0:
 nmake -f Make_mvc.mak GUI=yes CSCOPE=yes NETBEANS=yes XPM=e:\hg\xpm\x86