Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenkernel/BKE_particle.h
	source/blender/blenkernel/intern/library.c
	source/blender/blenkernel/intern/particle.c

source/blender/editors/interface/interface_icons.c

@@ -1092,6 +1092,7 @@ void ui_icon_ensure_deferred(const bContext *C, const int icon_id, const bool bi
 							ui_id_preview_image_render_size(C, NULL, id, prv, size, true);
 						}
 					}
+					break;
 				}
 			}
 		}