[Bf-blender-cvs] [009cd8290b7] cycles_embree: Merge branch 'master' of git.blender.org:blender into cycles_embree

[Stefan Werner]

Commit: 009cd8290b7087c68bd33b8d7d33cb2631286072
Author: Stefan Werner
Date:   Tue Jun 19 14:25:21 2018 +0200
Branches: cycles_embree
https://developer.blender.org/rB009cd8290b7087c68bd33b8d7d33cb2631286072

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

===================================================================



===================================================================