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

[L. E. Segovia]

Commit: 909712423b9efb359c84327838bde2ca0873b8ba
Author: L. E. Segovia
Date:   Mon Jun 25 21:05:59 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB909712423b9efb359c84327838bde2ca0873b8ba

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

Week 7 merge for this week's builds

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



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