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

[L. E. Segovia]

Commit: 60a59fbae6b04f59e91f540eabc52102f354cd0a
Author: L. E. Segovia
Date:   Mon Jun 11 19:00:07 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB60a59fbae6b04f59e91f540eabc52102f354cd0a

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

Use the latest Week 5 commits for build

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



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