Blender Git Loki

Merge branch 'master' into blender2.8

Conflicts:
source/blender/alembic/intern/abc_exporter.cc
source/blender/blenkernel/BKE_mball.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/mball.c
source/blender/editors/object/object_add.c
source/blender/render/intern/source/convertblender.c