Blender Git Loki

Merge branch 'blender2.8' into workspaces

Conflicts:
source/blender/blenkernel/intern/context.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/library_query.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/readfile.h
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/workspace/screen_context.c
source/blender/makesdna/intern/makesdna.c
source/blenderplayer/bad_level_call_stubs/stubs.c