Blender Git Loki

Merge branch 'master' of git.blender.org:blender into temp-cryptomatte

# Conflicts:
# intern/cycles/blender/addon/properties.py
# intern/cycles/blender/blender_session.cpp
# intern/cycles/blender/blender_sync.cpp
# intern/cycles/kernel/kernel_passes.h
# intern/cycles/kernel/kernel_path.h
# intern/cycles/kernel/kernel_path_branched.h
# intern/cycles/kernel/kernel_types.h
# intern/cycles/render/buffers.cpp
# intern/cycles/render/buffers.h
# intern/cycles/render/film.cpp
# intern/cycles/render/film.h
# source/blender/editors/space_node/drawnode.c