Merged changes in the trunk up to revision 50829.

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.

source/blender/python/intern/bpy.c

@@ -37,6 +37,7 @@
 #include "bpy_rna.h"
 #include "bpy_app.h"
 #include "bpy_props.h"
+#include "bpy_library.h"
 #include "bpy_operator.h"
 
 #include "BLI_path_util.h"
@@ -240,7 +241,6 @@ static PyObject *bpy_import_test(const char *modname)
 void BPy_init_modules(void)
 {
 	extern BPy_StructRNA *bpy_context_module;
-	extern int bpy_lib_init(PyObject *);
 	PointerRNA ctx_ptr;
 	PyObject *mod;
 
@@ -276,7 +276,7 @@ void BPy_init_modules(void)
 	PyModule_AddObject(mod, "StructMetaPropGroup", (PyObject *)&pyrna_struct_meta_idprop_Type);
 
 	/* needs to be first so bpy_types can run */
-	bpy_lib_init(mod);
+	BPY_library_module(mod);
 
 	bpy_import_test("bpy_types");
 	PyModule_AddObject(mod, "data", BPY_rna_module()); /* imports bpy_types by running this */