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

[Sergey Sharybin]

Commit: 2e27bc96f4eb4ff1ea5d2ff4cabdbe2ffe2deaac
Author: Sergey Sharybin
Date:   Thu May 12 16:19:35 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rB2e27bc96f4eb4ff1ea5d2ff4cabdbe2ffe2deaac

Merge branch 'master' into cycles_hair_bvh

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



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