Conflicts: source/blender/blenloader/intern/readfile.c source/blender/editors/physics/particle_edit.c