Merge remote-tracking branch 'vim/master'

Author: splhack

src/testdir/test_modeline.vim

@@ -5,4 +5,5 @@ func Test_modeline_invalid()
   call writefile(['vi:0', 'nothing'], 'Xmodeline')
   call assert_fails('split Xmodeline', 'E518:')
   bwipe!
+  call delete('Xmodeline')
 endfunc

src/version.c

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