svn merge ^/trunk/blender -r46699:46714

diff --cc source/blender/blenkernel/intern/depsgraph.c
Simple merge

diff --cc source/blender/blenloader/intern/readfile.c
Simple merge

diff --cc source/blender/editors/screen/screen_ops.c
Simple merge

diff --cc source/blender/makesdna/intern/makesdna.c
Simple merge

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

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