Blender Git Loki

Merge remote-tracking branch 'origin/master' into temp-cycles-denoising

Conflicts:
intern/cycles/device/CMakeLists.txt
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/device/device_task.h
intern/cycles/device/opencl/opencl_split.cpp
intern/cycles/kernel/CMakeLists.txt
intern/cycles/kernel/kernel_path_branched.h
intern/cycles/kernel/kernel_path_surface.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
intern/cycles/kernel/kernels/cuda/kernel.cu
intern/cycles/kernel/split/kernel_buffer_update.h
intern/cycles/kernel/svm/svm_closure.h
intern/cycles/util/util_atomic.h