Blender Git Loki

Merge branch 'blender2.8' into workspaces

Conflicts:
source/blender/blenkernel/BKE_layer.h
source/blender/blenkernel/intern/layer.c
source/blender/blenkernel/intern/library_query.c
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/space_image/space_image.c