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

[Sergey Sharybin]

Commit: 21224fbbcd6c0e5561d79d79a137dc315fbcbd34
Author: Sergey Sharybin
Date:   Wed May 11 16:51:49 2016 +0200
Branches: cycles_hair_bvh
https://developer.blender.org/rB21224fbbcd6c0e5561d79d79a137dc315fbcbd34

Merge branch 'master' into cycles_hair_bvh

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



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