Blender Git Loki

Merge branch 'hair_immediate_fixes' into gooseberry

Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/editors/physics/particle_edit.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/hair_volume.cpp
source/blender/physics/intern/implicit.h
source/blender/physics/intern/implicit_blender.c
source/blender/physics/intern/implicit_eigen.cpp