Blender Git Loki

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

# Conflicts:
# source/blender/blenkernel/BKE_DerivedMesh.h
# source/blender/blenkernel/intern/DerivedMesh.c
# source/blender/blenkernel/intern/anim_data.c
# source/blender/blenlib/PIL_time_utildefines.h
# source/blender/editors/space_info/info_intern.h
# source/blender/windowmanager/intern/wm_event_system.c
# source/blender/windowmanager/intern/wm_files.c