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

[Sergey Sharybin]

Commit: ee2a9e5ebcf353716b99286b48a31cec23b2bcdf
Author: Sergey Sharybin
Date:   Mon Jun 13 15:18:00 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBee2a9e5ebcf353716b99286b48a31cec23b2bcdf

Merge branch 'master' into cycles_bvh

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



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