Blender Git Loki

Merge 'master' into 'fluid-mantaflow'

Conflicts:
release/scripts/startup/bl_ui/properties_physics_common.py
release/scripts/startup/bl_ui/properties_physics_smoke.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/smoke.c
source/blender/editors/physics/CMakeLists.txt
source/blender/makesdna/DNA_smoke_types.h
source/blender/modifiers/intern/MOD_smoke.c