Blender Git Loki

Merge branch 'hair_immediate_fixes' into hair_system_solver

Conflicts:
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit.h
source/blender/physics/intern/implicit_blender.c