Blender Git Loki

Merge branch 'master' into soc-2020-info-editor

# Conflicts:
# source/blender/blenkernel/intern/ipo.c
# source/blender/blenkernel/intern/mask_rasterize.c
# source/blender/blenkernel/intern/nla.c
# source/blender/blenkernel/intern/particle.c
# source/blender/blenkernel/intern/softbody.c
# source/blender/blenloader/intern/readfile.c
# source/blender/bmesh/tools/bmesh_bevel.c
# source/blender/editors/interface/interface.c
# source/blender/editors/interface/interface_anim.c
# source/blender/modifiers/intern/MOD_datatransfer.c
# source/blender/python/intern/bpy_rna.c
# source/blender/python/intern/bpy_rna_anim.c