Merge branch 'master' into blender2.8

diff --cc intern/cycles/render/buffers.cpp
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_data_armature.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_object.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_particle.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_physics_cloth.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_physics_field.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_physics_smoke.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_physics_softbody.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_scene.py
Simple merge

diff --cc release/scripts/startup/bl_ui/properties_texture.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_image.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_node.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d.py
Simple merge

diff --cc release/scripts/startup/bl_ui/space_view3d_toolbar.py
Simple merge

diff --cc source/blender/blenkernel/intern/nla.c
Simple merge

diff --cc source/blender/editors/animation/keyframing.c
Simple merge

diff --cc source/blender/nodes/intern/node_socket.c
Simple merge