Merge remote-tracking branch 'vim/master'

Author: splhack

src/testdir/test_netbeans.py

@@ -52,7 +52,7 @@ def handle(self):
                 return
 
             if len(response) > 0:
-                self.request.sendall(response)
+                self.request.sendall(response.encode('utf-8'))
                 # Write the respoinse into the file, so that the test can knows
                 # the command was sent.
                 with open("Xnetbeans", "a") as myfile:

src/version.c

@@ -779,6 +779,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5,
 /**/
     4,
 /**/