Blender Git Loki

Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-solidify

# Conflicts:
# release/scripts/startup/nodeitems_builtins.py
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/blenkernel/intern/solidify_nonmanifold.c
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h