[Bf-blender-cvs] [dc28253] cycles_bvh: Merge branch 'master' into cycles_bvh

[Sergey Sharybin]

Commit: dc28253e36e0fac33a9b18ae74aaaa502bc817b8
Author: Sergey Sharybin
Date:   Fri Jun 17 12:15:11 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBdc28253e36e0fac33a9b18ae74aaaa502bc817b8

Merge branch 'master' into cycles_bvh

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



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