[Bf-blender-cvs] [c38b9e12b21] functions: Merge branch 'master' into functions

[Jacques Lucke]

Commit: c38b9e12b2109416209415f418f6185e5351ebc4
Author: Jacques Lucke
Date:   Fri May 3 10:43:49 2019 +0200
Branches: functions
https://developer.blender.org/rBc38b9e12b2109416209415f418f6185e5351ebc4

Merge branch 'master' into functions

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



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