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

[Campbell Barton]

Commit: 45afcd6b86be25c4acede0c7afcf1a3384d99cad
Author: Campbell Barton
Date:   Thu Dec 6 15:08:42 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB45afcd6b86be25c4acede0c7afcf1a3384d99cad

Merge branch 'master' into blender2.8

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



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