Merge branch 'master' of git.blender.org:blender into cycles_embree

# Conflicts:
#	intern/cycles/bvh/bvh.cpp
#	intern/cycles/device/device.cpp
#	intern/cycles/device/device.h
#	intern/cycles/device/device_cpu.cpp
#	intern/cycles/kernel/geom/geom_object.h
#	intern/cycles/render/mesh.cpp
#	intern/cycles/render/scene.h