Blender Git Commit Log

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/filelist.c