Blender Git Loki

Merge branch 'master' into asset-experiments

Conflicts:
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_file/filelist.c
source/blender/imbuf/IMB_thumbs.h
source/blender/imbuf/intern/thumbs.c
source/blender/imbuf/intern/thumbs_blend.c