Blender Git Commit Log

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_fileselect.h
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_file/file_ops.c
source/blender/editors/space_file/fsmenu.c
source/blender/editors/space_file/space_file.c
source/blender/makesrna/intern/rna_space.c