Merged changes in the trunk up to revision 52815.

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

diff --cc doc/python_api/sphinx_doc_gen.py
index dd7019d43a317476ec2460baf1141344db979bb3,441a6c04efe795080a763c402bceb41209e153c9..d79c4e8fa9ad101eda5e39f579dd85421e970352
--- 1/doc/python_api/sphinx_doc_gen.py
--- 2/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@@ -1545,9 -1539,9 +1547,9 @@@ def write_rst_contents(basepath)
          # mathutils
          "mathutils", "mathutils.geometry", "mathutils.noise",
          # misc
 -        "bgl", "blf", "gpu", "aud", "bpy_extras",
 +        "Freestyle", "bgl", "blf", "gpu", "aud", "bpy_extras",
-         # bmesh
-         "bmesh", "bmesh.types", "bmesh.utils", "bmesh.ops",
+         # bmesh, submodules are in own page
+         "bmesh",
          )
  
      for mod in standalone_modules:

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

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

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

diff --cc source/blender/blenlib/intern/bpath.c
Simple merge

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

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

diff --cc source/blender/editors/space_buttons/buttons_context.c
Simple merge

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

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

diff --cc source/blender/makesrna/RNA_access.h
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