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

[Sergey Sharybin]

Commit: a3803207d527656eff1d010f42786f0f0a7fc3e2
Author: Sergey Sharybin
Date:   Thu Apr 28 13:53:54 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rBa3803207d527656eff1d010f42786f0f0a7fc3e2

Merge branch 'master' into cycles_hair_bvh

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



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