Merged changes in the trunk up to revision 52118.

Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c

source/creator/CMakeLists.txt

@@ -470,20 +470,6 @@ elseif(WIN32)
 		DESTINATION ${TARGETDIR}
 	)
 
-	if(WITH_INTERNATIONAL AND (NOT WITH_MINGW64))
-		install(
-			FILES ${LIBDIR}/gettext/lib/gnu_gettext.dll
-			DESTINATION ${TARGETDIR}
-		)
-
-		if(NOT CMAKE_CL_64)
-			install(
-				FILES ${LIBDIR}/iconv/lib/iconv.dll
-				DESTINATION ${TARGETDIR}
-			)
-		endif()
-	endif()
-
 	if(WITH_PYTHON)
 		set_lib_path(PYLIB "python")
 		install(
@@ -531,7 +517,7 @@ elseif(WIN32)
 	endif()
 
 	if(CMAKE_CL_64)
-		# gettext and png are statically linked on win64
+		# png is statically linked on win64
 		install(
 			FILES ${LIBDIR}/zlib/lib/zlib.dll
 			DESTINATION ${TARGETDIR}
@@ -989,6 +975,10 @@ endif()
 		list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
 	endif()
 
+	if(WITH_INTERNATIONAL)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
+	endif()
+
 	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
 		set(REMLIB ${SORTLIB})
 		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})