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

[Sergey Sharybin]

Commit: 860f316c83c30f65341e3074b5281f1b7d08c38e
Author: Sergey Sharybin
Date:   Fri May 13 11:22:57 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rB860f316c83c30f65341e3074b5281f1b7d08c38e

Merge branch 'master' into cycles_hair_bvh

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



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