Blender Git Loki

Merge branch 'master' into particles_refactor

Conflicts:
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenloader/intern/writefile.c
source/blender/python/intern/bpy_interface.c
source/creator/CMakeLists.txt