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

[L. E. Segovia]

Commit: 9b96b00910148a4342e85c402562aa5b125d0a5a
Author: L. E. Segovia
Date:   Wed Jun 27 20:27:14 2018 +0000
Branches: soc-2018-hair-shader
https://developer.blender.org/rB9b96b00910148a4342e85c402562aa5b125d0a5a

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

Week 7 merge: preparing for cleanup

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



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