Blender Git Loki

Merge branch 'gooseberry' into strand_editmode

Conflicts:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_brush_types.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/physics/intern/implicit.h