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

[Campbell Barton]

Commit: dd96c8dda7a9b58bfb5d66dc0aa6158945b94c1c
Author: Campbell Barton
Date:   Fri Nov 9 11:51:14 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBdd96c8dda7a9b58bfb5d66dc0aa6158945b94c1c

Merge branch 'master' into blender2.8

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



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