Merged changes in the trunk up to revision 52191.

Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h

diff --cc build_files/scons/tools/Blender.py
Simple merge

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

diff --cc source/blender/blenkernel/SConscript
Simple merge

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

diff --cc source/blender/bmesh/bmesh_class.h
Simple merge

diff --cc source/blender/bmesh/intern/bmesh_construct.c
Simple merge

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

diff --cc source/blender/editors/mesh/editmesh_select.c
Simple merge

diff --cc source/blender/editors/mesh/mesh_intern.h
Simple merge

diff --cc source/blender/editors/mesh/mesh_ops.c
Simple merge

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

diff --cc source/blender/render/intern/source/pipeline.c
Simple merge