Blender Git Loki

Merge branch 'openvdb' into gooseberry

Conflicts:
build_files/buildbot/config/user-config-player-glibc211-i686.py
build_files/buildbot/config/user-config-player-glibc211-x86_64.py
build_files/scons/tools/Blender.py
intern/cycles/blender/blender_shader.cpp
intern/cycles/kernel/svm/svm_types.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/smoke.c
source/blender/makesdna/DNA_smoke_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_smoke.c