Merged 38568-38822

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

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

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

diff --cc source/blender/editors/armature/editarmature.c
Simple merge

diff --cc source/blender/editors/interface/interface_templates.c
Simple merge

diff --cc source/blender/editors/space_view3d/view3d_header.c
Simple merge

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

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