[Bf-blender-cvs] [b057a293cc5] soc-2019-cycles-procedural: Merge master and fix merge conflicts

[OmarSquircleArt]

Commit: b057a293cc5ef7b2b46697113b6d57c8c24eb5f8
Author: OmarSquircleArt
Date:   Wed Jul 10 15:45:40 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rBb057a293cc5ef7b2b46697113b6d57c8c24eb5f8

Merge master and fix merge conflicts

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



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