Merge remote-tracking branch 'origin/master' into blender2.8

diff --cc release/scripts/startup/bl_ui/space_image.py
Simple merge

diff --cc source/blender/collada/DocumentImporter.cpp
index ec9a4169b267bb25df9fab87bed14c7340bf690c,f7fdfb06a405413c35553f42b64a94be05beab84..d3e23f740c879e2caee827696307c62e62d64f07
--- 1/source/blender/collada/DocumentImporter.cpp
--- 2/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@@ -57,12 -57,12 +57,13 @@@ extern "C" 
  #include "BLI_fileops.h"
  
  #include "BKE_camera.h"
 +#include "BKE_collection.h"
  #include "BKE_main.h"
 +#include "BKE_layer.h"
  #include "BKE_lamp.h"
  #include "BKE_library.h"
+ #include "BKE_texture.h"
  #include "BKE_fcurve.h"
 -#include "BKE_depsgraph.h"
  #include "BKE_scene.h"
  #include "BKE_global.h"
  #include "BKE_material.h"