svn merge ^/trunk/blender -r48911:48927

diff --cc release/scripts/startup/bl_ui/space_clip.py
Simple merge

diff --cc source/blender/blenkernel/BKE_mask.h
Simple merge

diff --cc source/blender/editors/space_node/drawnode.c
Simple merge

diff --cc source/blender/editors/space_node/node_draw.c
Simple merge

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