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

[Sergey Sharybin]

Commit: ac0cd0a757153882a1558d7cde7b2a5d89ff7bdf
Author: Sergey Sharybin
Date:   Wed Jul 6 17:42:48 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBac0cd0a757153882a1558d7cde7b2a5d89ff7bdf

Merge branch 'master' into cycles_bvh

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



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