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/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h

@@ -36,7 +36,7 @@
 #include "NG_NetworkDeviceInterface.h"
 
 class NG_LoopBackNetworkDeviceInterface : public NG_NetworkDeviceInterface
-{	
+{
 	std::deque<NG_NetworkMessage*> m_messages[2];
 	int		m_currentQueue;