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

[Sergey Sharybin]

Commit: 086f115a55957f87b5256083bad3be93d608abc0
Author: Sergey Sharybin
Date:   Fri Apr 22 11:34:45 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rB086f115a55957f87b5256083bad3be93d608abc0

Merge branch 'master' into cycles_hair_bvh

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



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