[Bf-blender-cvs] [c27b931] cycles_hair_bvh: Merge branch 'master' into cycles_hair_bvh

[Sergey Sharybin]

Commit: c27b93157e1f91a10cf973c52db1886f44cec628
Author: Sergey Sharybin
Date:   Fri Apr 29 10:55:25 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rBc27b93157e1f91a10cf973c52db1886f44cec628

Merge branch 'master' into cycles_hair_bvh

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



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