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

[Jacques Lucke]

Commit: 20e12025eaf77ddf55b9a16a672c36a91e5b10b1
Author: Jacques Lucke
Date:   Sun Mar 24 18:41:02 2019 +0100
Branches: functions
https://developer.blender.org/rB20e12025eaf77ddf55b9a16a672c36a91e5b10b1

Merge branch 'master' into functions

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



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