[Bf-blender-cvs] [535e2e4ade2] soc-2018-hair-shader: Merge branch 'master' into soc-2018-hair-shader

[L. E. Segovia]

Commit: 535e2e4ade24801c123017ad5b1fe8e580c1d382
Author: L. E. Segovia
Date:   Wed Jun 13 17:22:33 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB535e2e4ade24801c123017ad5b1fe8e580c1d382

Merge branch 'master' into soc-2018-hair-shader

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



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