svn merge ^/trunk/blender -r48585:48604

diff --cc CMakeLists.txt
Simple merge

diff --cc source/blender/compositor/CMakeLists.txt
Simple merge

diff --cc source/blender/compositor/intern/COM_Converter.cpp
Simple merge

diff --cc source/blender/makesdna/DNA_node_types.h
Simple merge

diff --cc source/blender/makesrna/intern/rna_nodetree.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_scene.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_space.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_userdef.c
Simple merge

diff --cc source/blender/makesrna/intern/rna_wm.c
Simple merge