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_sync.cpp
# intern/cycles/device/device_cpu.cpp
# intern/cycles/kernel/geom/geom_object.h
# intern/cycles/kernel/kernel_path_branched.h
# intern/cycles/kernel/kernel_types.h
# intern/cycles/render/buffers.cpp
# intern/cycles/render/film.cpp
# intern/cycles/render/integrator.cpp
# intern/cycles/render/object.cpp
# intern/cycles/render/osl.cpp
# intern/cycles/render/osl.h
# intern/cycles/render/scene.cpp
# intern/cycles/render/shader.cpp
# intern/cycles/render/svm.cpp
# intern/cycles/render/svm.h
# release/scripts/startup/nodeitems_builtins.py
# source/blender/editors/include/UI_interface.h
# source/blender/editors/interface/interface_eyedropper.c
# source/blender/makesdna/DNA_scene_types.h
# source/blender/render/extern/include/RE_engine.h
# source/blender/render/intern/source/render_result.c
# source/blenderplayer/bad_level_call_stubs/stubs.c