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

[Jacques Lucke]

Commit: b8cb48b630eb4cc46dedcf33d44a8cbfa75eeeb9
Author: Jacques Lucke
Date:   Tue Jun 4 16:31:37 2019 +0200
Branches: functions
https://developer.blender.org/rBb8cb48b630eb4cc46dedcf33d44a8cbfa75eeeb9

Merge branch 'master' into functions

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



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