Blender Git Loki

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/blenkernel/BKE_camera.h
source/blender/blenkernel/intern/camera.c
source/blender/blenlib/BLI_fileops.h
source/blender/blenlib/intern/storage.c
source/blender/editors/space_file/filelist.c
source/blender/makesrna/intern/rna_object_api.c
tests/gtests/blenlib/BLI_path_util_test.cc