diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake
index 2bfc4cda20c..0d486c84fe6 100644
--- a/build_files/cmake/platform/platform_unix.cmake
+++ b/build_files/cmake/platform/platform_unix.cmake
@@ -39,6 +39,10 @@ if(EXISTS ${LIBDIR})
 	set(WITH_OPENMP_STATIC ON)
 endif()
 
+if(WITH_STATIC_LIBS)
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
+endif()
+
 # Wrapper to prefer static libraries
 macro(find_package_wrapper)
 	if(WITH_STATIC_LIBS)
diff --git a/release/datafiles/locale b/release/datafiles/locale
index 29c22181021..f81ed052157 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 29c2218102135522d6e2cd4bba7ab47d7241ab8a
+Subproject commit f81ed052157aff3979763cf25840032d11d261b6
diff --git a/release/scripts/addons b/release/scripts/addons
index c94604993b3..26330ab1434 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c94604993b3e0bfbc733861e890aff18513e02b4
+Subproject commit 26330ab14347cef00d67e2e4335c9609082e227b
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 3a80a18ea08..57596569d9b 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 3a80a18ea081ff93f4b3672120b446b7adc93e81
+Subproject commit 57596569d9bc50230a0430e7ed159c963c00814c