[Bf-blender-cvs] [c312cc171b3] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: c312cc171b3e85306fb4c0d67f260bac14af2bfe
Author: Campbell Barton
Date:   Fri Nov 30 14:58:46 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBc312cc171b3e85306fb4c0d67f260bac14af2bfe

Merge branch 'master' into blender2.8

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



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