Blender Git Loki

Merge branch 'master' into openvdb

Conflicts:
SConstruct
build_files/scons/config/darwin-config.py
build_files/scons/config/linux-config.py
build_files/scons/config/win32-mingw-config.py
build_files/scons/config/win32-vc-config.py
build_files/scons/config/win64-mingw-config.py
build_files/scons/config/win64-vc-config.py
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
intern/SConscript
intern/cycles/SConscript
source/blender/blenkernel/SConscript
source/blender/editors/object/SConscript
source/blender/editors/space_view3d/SConscript
source/blender/nodes/SConscript
source/blender/python/SConscript