Merge branch 'master' into asset-uuid--archivedasset-uuid--archived

3 files changed, 2 insertions, 2 deletions

diff --git a/release/datafiles/blender_icons_geom_update.py b/release/datafiles/blender_icons_geom_update.py
index 3b7724756db..5b95961ae6b 100755
--- a/release/datafiles/blender_icons_geom_update.py
+++ b/release/datafiles/blender_icons_geom_update.py
@@ -21,10 +21,10 @@ def edit_text_file(filename, marker_begin, marker_end, content):
     while data[marker_end_index - 1] in {'\t', ' '}:
         marker_end_index -= 1
     if marker_begin_index == -1:
-        print('Error: {!r} not found'.format(marker_begin))
+        print('Error: %r not found' % marker_begin)
         return
     if marker_end_index == -1:
-        print('Error: {!r} not found'.format(marker_end))
+        print('Error: %r not found' % marker_end)
         return
     marker_begin_index += len(marker_begin) + 1
     data_update = data[:marker_begin_index] + content + data[marker_end_index:]
diff --git a/release/datafiles/icons/ops.mesh.extrude_manifold.dat b/release/datafiles/icons/ops.mesh.extrude_manifold.dat
new file mode 100644
index 00000000000..c1cc5b2d723
--- /dev/null
+++ b/release/datafiles/icons/ops.mesh.extrude_manifold.dat
diff --git a/release/datafiles/locale b/release/datafiles/locale
-Subproject 72e5040232a544b293dca05dac5707bd4e4bffa
+Subproject caf68fed42f55e606b14c7105f5df694957ce03