diff --git a/runtime/tools/unicode.vim b/runtime/tools/unicode.vim
index 630a581996..c289868c5a 100644
--- a/runtime/tools/unicode.vim
+++ b/runtime/tools/unicode.vim
@@ -420,6 +420,10 @@ if Test_AddLinesToCharDict() || Test_CharDictToPairList()
   finish
 endif
 
+if !exists("g:loaded_netrw")
+  echomsg "Netrw not available, cannot download"
+  finish
+endif
 
 " Try to avoid hitting E36
 set equalalways
diff --git a/src/mbyte.c b/src/mbyte.c
index a2d36f151f..4a7eada25a 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -1389,8 +1389,10 @@ utf_char2cells(int c)
 	{0x23f3, 0x23f3},
 	{0x25fd, 0x25fe},
 	{0x2614, 0x2615},
+	{0x2630, 0x2637},
 	{0x2648, 0x2653},
 	{0x267f, 0x267f},
+	{0x268a, 0x268f},
 	{0x2693, 0x2693},
 	{0x26a1, 0x26a1},
 	{0x26aa, 0x26ab},
@@ -1424,11 +1426,10 @@ utf_char2cells(int c)
 	{0x3099, 0x30ff},
 	{0x3105, 0x312f},
 	{0x3131, 0x318e},
-	{0x3190, 0x31e3},
+	{0x3190, 0x31e5},
 	{0x31ef, 0x321e},
 	{0x3220, 0x3247},
-	{0x3250, 0x4dbf},
-	{0x4e00, 0xa48c},
+	{0x3250, 0xa48c},
 	{0xa490, 0xa4c6},
 	{0xa960, 0xa97c},
 	{0xac00, 0xd7a3},
@@ -1443,7 +1444,7 @@ utf_char2cells(int c)
 	{0x16ff0, 0x16ff1},
 	{0x17000, 0x187f7},
 	{0x18800, 0x18cd5},
-	{0x18d00, 0x18d08},
+	{0x18cff, 0x18d08},
 	{0x1aff0, 0x1aff3},
 	{0x1aff5, 0x1affb},
 	{0x1affd, 0x1affe},
@@ -1453,6 +1454,8 @@ utf_char2cells(int c)
 	{0x1b155, 0x1b155},
 	{0x1b164, 0x1b167},
 	{0x1b170, 0x1b2fb},
+	{0x1d300, 0x1d356},
+	{0x1d360, 0x1d376},
 	{0x1f004, 0x1f004},
 	{0x1f0cf, 0x1f0cf},
 	{0x1f18e, 0x1f18e},
@@ -1493,11 +1496,10 @@ utf_char2cells(int c)
 	{0x1f93c, 0x1f945},
 	{0x1f947, 0x1f9ff},
 	{0x1fa70, 0x1fa7c},
-	{0x1fa80, 0x1fa88},
-	{0x1fa90, 0x1fabd},
-	{0x1fabf, 0x1fac5},
-	{0x1face, 0x1fadb},
-	{0x1fae0, 0x1fae8},
+	{0x1fa80, 0x1fa89},
+	{0x1fa8f, 0x1fac6},
+	{0x1face, 0x1fadc},
+	{0x1fadf, 0x1fae9},
 	{0x1faf0, 0x1faf8},
 	{0x20000, 0x2fffd},
 	{0x30000, 0x3fffd}
@@ -2357,7 +2359,7 @@ utf_iscomposing(int c)
 	{0x0825, 0x0827},
 	{0x0829, 0x082d},
 	{0x0859, 0x085b},
-	{0x0898, 0x089f},
+	{0x0897, 0x089f},
 	{0x08ca, 0x08e1},
 	{0x08e3, 0x0902},
 	{0x093a, 0x093a},
@@ -2552,8 +2554,9 @@ utf_iscomposing(int c)
 	{0x10a3f, 0x10a3f},
 	{0x10ae5, 0x10ae6},
 	{0x10d24, 0x10d27},
+	{0x10d69, 0x10d6d},
 	{0x10eab, 0x10eac},
-	{0x10efd, 0x10eff},
+	{0x10efc, 0x10eff},
 	{0x10f46, 0x10f50},
 	{0x10f82, 0x10f85},
 	{0x11001, 0x11001},
@@ -2584,6 +2587,11 @@ utf_iscomposing(int c)
 	{0x11340, 0x11340},
 	{0x11366, 0x1136c},
 	{0x11370, 0x11374},
+	{0x113bb, 0x113c0},
+	{0x113ce, 0x113ce},
+	{0x113d0, 0x113d0},
+	{0x113d2, 0x113d2},
+	{0x113e1, 0x113e2},
 	{0x11438, 0x1143f},
 	{0x11442, 0x11444},
 	{0x11446, 0x11446},
@@ -2603,7 +2611,8 @@ utf_iscomposing(int c)
 	{0x116ad, 0x116ad},
 	{0x116b0, 0x116b5},
 	{0x116b7, 0x116b7},
-	{0x1171d, 0x1171f},
+	{0x1171d, 0x1171d},
+	{0x1171f, 0x1171f},
 	{0x11722, 0x11725},
 	{0x11727, 0x1172b},
 	{0x1182f, 0x11837},
@@ -2642,8 +2651,11 @@ utf_iscomposing(int c)
 	{0x11f36, 0x11f3a},
 	{0x11f40, 0x11f40},
 	{0x11f42, 0x11f42},
+	{0x11f5a, 0x11f5a},
 	{0x13440, 0x13440},
 	{0x13447, 0x13455},
+	{0x1611e, 0x16129},
+	{0x1612d, 0x1612f},
 	{0x16af0, 0x16af4},
 	{0x16b30, 0x16b36},
 	{0x16f4f, 0x16f4f},
@@ -2673,6 +2685,7 @@ utf_iscomposing(int c)
 	{0x1e2ae, 0x1e2ae},
 	{0x1e2ec, 0x1e2ef},
 	{0x1e4ec, 0x1e4ef},
+	{0x1e5ee, 0x1e5ef},
 	{0x1e8d0, 0x1e8d6},
 	{0x1e944, 0x1e94a},
 	{0xe0100, 0xe01ef}
@@ -3129,6 +3142,7 @@ static convertStruct foldCase[] =
 	{0x1c86,0x1c86,-1,-6204},
 	{0x1c87,0x1c87,-1,-6180},
 	{0x1c88,0x1c88,-1,35267},
+	{0x1c89,0x1c89,-1,1},
 	{0x1c90,0x1cba,1,-3008},
 	{0x1cbd,0x1cbf,1,-3008},
 	{0x1e00,0x1e94,2,1},
@@ -3208,8 +3222,11 @@ static convertStruct foldCase[] =
 	{0xa7c5,0xa7c5,-1,-42307},
 	{0xa7c6,0xa7c6,-1,-35384},
 	{0xa7c7,0xa7c9,2,1},
-	{0xa7d0,0xa7d6,6,1},
-	{0xa7d8,0xa7f5,29,1},
+	{0xa7cb,0xa7cb,-1,-42343},
+	{0xa7cc,0xa7d0,4,1},
+	{0xa7d6,0xa7da,2,1},
+	{0xa7dc,0xa7dc,-1,-42561},
+	{0xa7f5,0xa7f5,-1,1},
 	{0xab70,0xabbf,1,-38864},
 	{0xfb05,0xfb05,-1,1},
 	{0xff21,0xff3a,1,32},
@@ -3220,6 +3237,7 @@ static convertStruct foldCase[] =
 	{0x1058c,0x10592,1,39},
 	{0x10594,0x10595,1,39},
 	{0x10c80,0x10cb2,1,64},
+	{0x10d50,0x10d65,1,32},
 	{0x118a0,0x118bf,1,32},
 	{0x16e40,0x16e5f,1,32},
 	{0x1e900,0x1e921,1,34}
@@ -3364,6 +3382,7 @@ static convertStruct toLower[] =
 	{0x10c7,0x10cd,6,7264},
 	{0x13a0,0x13ef,1,38864},
 	{0x13f0,0x13f5,1,8},
+	{0x1c89,0x1c89,-1,1},
 	{0x1c90,0x1cba,1,-3008},
 	{0x1cbd,0x1cbf,1,-3008},
 	{0x1e00,0x1e94,2,1},
@@ -3439,8 +3458,11 @@ static convertStruct toLower[] =
 	{0xa7c5,0xa7c5,-1,-42307},
 	{0xa7c6,0xa7c6,-1,-35384},
 	{0xa7c7,0xa7c9,2,1},
-	{0xa7d0,0xa7d6,6,1},
-	{0xa7d8,0xa7f5,29,1},
+	{0xa7cb,0xa7cb,-1,-42343},
+	{0xa7cc,0xa7d0,4,1},
+	{0xa7d6,0xa7da,2,1},
+	{0xa7dc,0xa7dc,-1,-42561},
+	{0xa7f5,0xa7f5,-1,1},
 	{0xff21,0xff3a,1,32},
 	{0x10400,0x10427,1,40},
 	{0x104b0,0x104d3,1,40},
@@ -3449,6 +3471,7 @@ static convertStruct toLower[] =
 	{0x1058c,0x10592,1,39},
 	{0x10594,0x10595,1,39},
 	{0x10c80,0x10cb2,1,64},
+	{0x10d50,0x10d65,1,32},
 	{0x118a0,0x118bf,1,32},
 	{0x16e40,0x16e5f,1,32},
 	{0x1e900,0x1e921,1,34}
@@ -3477,6 +3500,7 @@ static convertStruct toUpper[] =
 	{0x195,0x195,-1,97},
 	{0x199,0x199,-1,-1},
 	{0x19a,0x19a,-1,163},
+	{0x19b,0x19b,-1,42561},
 	{0x19e,0x19e,-1,130},
 	{0x1a1,0x1a5,2,-1},
 	{0x1a8,0x1ad,5,-1},
@@ -3514,6 +3538,7 @@ static convertStruct toUpper[] =
 	{0x260,0x260,-1,-205},
 	{0x261,0x261,-1,42315},
 	{0x263,0x263,-1,-207},
+	{0x264,0x264,-1,42343},
 	{0x265,0x265,-1,42280},
 	{0x266,0x266,-1,42308},
 	{0x268,0x268,-1,-209},
@@ -3579,6 +3604,7 @@ static convertStruct toUpper[] =
 	{0x1c86,0x1c86,-1,-6236},
 	{0x1c87,0x1c87,-1,-6181},
 	{0x1c88,0x1c88,-1,35266},
+	{0x1c8a,0x1c8a,-1,-1},
 	{0x1d79,0x1d79,-1,35332},
 	{0x1d7d,0x1d7d,-1,3814},
 	{0x1d8e,0x1d8e,-1,35384},
@@ -3636,8 +3662,9 @@ static convertStruct toUpper[] =
 	{0xa797,0xa7a9,2,-1},
 	{0xa7b5,0xa7c3,2,-1},
 	{0xa7c8,0xa7ca,2,-1},
-	{0xa7d1,0xa7d7,6,-1},
-	{0xa7d9,0xa7f6,29,-1},
+	{0xa7cd,0xa7d1,4,-1},
+	{0xa7d7,0xa7db,2,-1},
+	{0xa7f6,0xa7f6,-1,-1},
 	{0xab53,0xab53,-1,-928},
 	{0xab70,0xabbf,1,-38864},
 	{0xff41,0xff5a,1,-32},
@@ -3648,6 +3675,7 @@ static convertStruct toUpper[] =
 	{0x105b3,0x105b9,1,-39},
 	{0x105bb,0x105bc,1,-39},
 	{0x10cc0,0x10cf2,1,-64},
+	{0x10d70,0x10d85,1,-32},
 	{0x118c0,0x118df,1,-32},
 	{0x16e60,0x16e7f,1,-32},
 	{0x1e922,0x1e943,1,-34}
diff --git a/src/version.c b/src/version.c
index dbcb6eb45b..d5aed36143 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    736,
 /**/
     735,
 /**/