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/gameengine/GamePlayer/common/GPC_RawImage.cpp

@@ -89,7 +89,7 @@ bool GPC_RawImage::Load(
 					// Put original in upper left corner
 
 					// Add vertical offset
-					dst += offsetY * dstBytesWidth;	
+					dst += offsetY * dstBytesWidth;
 					// Add horizontal offset
 					dst += offsetX * 4;
 					for (int row = 0; row < numRows; row++)