[Bf-blender-cvs] [06a966ebe71] functions: Merge 'master' into 'functions'

[Jacques Lucke]

Commit: 06a966ebe715923b6a05d8f44fc3efb7cf413ede
Author: Jacques Lucke
Date:   Wed Apr 17 10:25:47 2019 +0200
Branches: functions
https://developer.blender.org/rB06a966ebe715923b6a05d8f44fc3efb7cf413ede

Merge 'master' into 'functions'

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



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