diff --git a/release/datafiles/locale b/release/datafiles/locale
index f81ed052157..29c22181021 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit f81ed052157aff3979763cf25840032d11d261b6
+Subproject commit 29c2218102135522d6e2cd4bba7ab47d7241ab8a
diff --git a/release/scripts/addons b/release/scripts/addons
index 09b05312b94..c94604993b3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 09b05312b94f76a3096d00f464ee8e2ed7708585
+Subproject commit c94604993b3e0bfbc733861e890aff18513e02b4
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 57596569d9b..3a80a18ea08 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 57596569d9bc50230a0430e7ed159c963c00814c
+Subproject commit 3a80a18ea081ff93f4b3672120b446b7adc93e81
diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c
index 7ddecc8a7b6..cd720630a61 100644
--- a/source/blender/bmesh/tools/bmesh_bevel.c
+++ b/source/blender/bmesh/tools/bmesh_bevel.c
@@ -756,8 +756,11 @@ static int edges_angle_kind(EdgeHalf *e1, EdgeHalf *e2, BMVert *v)
 	v2 = BM_edge_other_vert(e2->e, v);
 	sub_v3_v3v3(dir1, v->co, v1->co);
 	sub_v3_v3v3(dir2, v->co, v2->co);
+	normalize_v3(dir1);
+	normalize_v3(dir2);
 	/* angles are in [0,pi]. need to compare cross product with normal to see if they are reflex */
 	cross_v3_v3v3(cross, dir1, dir2);
+	normalize_v3(cross);
 	if (e1->fnext)
 		no = e1->fnext->no;
 	else if (e2->fprev)