Blender Git Loki

Merge remote-tracking branch 'origin/master' into fracture_modifier-2.8

# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# intern/rigidbody/RBI_api.h
# intern/rigidbody/rb_bullet_api.cpp
# source/blender/blenkernel/BKE_rigidbody.h
# source/blender/blenkernel/intern/rigidbody.c
# source/blender/depsgraph/intern/builder/deg_builder_relations.cc
# source/blender/draw/intern/draw_manager.c
# source/blender/editors/physics/rigidbody_object.c
# source/blender/makesdna/DNA_modifier_types.h
# source/blender/makesdna/DNA_rigidbody_types.h
# source/blender/makesrna/intern/rna_modifier.c
# source/blender/makesrna/intern/rna_rigidbody.c
# source/blender/modifiers/intern/MOD_boolean.c
# source/blender/modifiers/intern/MOD_multires.c
# source/blender/modifiers/intern/MOD_remesh.c