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

[Campbell Barton]

Commit: bf2d0782bc4dfd4952a5cb0de8ab4e4c7b21fc12
Author: Campbell Barton
Date:   Thu Aug 9 08:20:06 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBbf2d0782bc4dfd4952a5cb0de8ab4e4c7b21fc12

Merge branch 'master' into blender2.8

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



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