Merge pull request #1196 from Shougo/vim-patch-7.4.381

vim-patch: 7.4.381

src/nvim/edit.c

@@ -7267,6 +7267,7 @@ static int ins_bs(int c, int mode, int *inserted_space_p)
       }
       --Insstart_orig.lnum;
       Insstart_orig.col = MAXCOL;
+      Insstart = Insstart_orig;
     }
     /*
      * In replace mode:

src/nvim/version.c

@@ -214,7 +214,7 @@ static int included_patches[] = {
   //384 NA
   //383,
   //382,
-  //381,
+  381,
   //380 NA
   379,
   //378,