Merged changes in the trunk up to revision 42021.

Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c

source/blender/python/intern/bpy.c

@@ -53,7 +53,7 @@
 #include "MEM_guardedalloc.h"
 
  /* external util modules */
-#include "../generic/IDProp.h"
+#include "../generic/idprop_py_api.h"
 #include "../generic/bgl.h"
 #include "../generic/blf_py_api.h"
 #include "../mathutils/mathutils.h"