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

[Campbell Barton]

Commit: 6844f7eb0cf5c7a5f83677ce92ca8f03b92c5b8a
Author: Campbell Barton
Date:   Tue Nov 13 08:25:46 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB6844f7eb0cf5c7a5f83677ce92ca8f03b92c5b8a

Merge branch 'master' into blender2.8

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



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