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

[Campbell Barton]

Commit: 39ee0f01e3b340e9c39c9d95df6acdba27694337
Author: Campbell Barton
Date:   Fri Aug 31 14:25:42 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB39ee0f01e3b340e9c39c9d95df6acdba27694337

Merge branch 'master' into blender2.8

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



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