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

[Campbell Barton]

Commit: f77f8198545ddea23a39686c001821c1a1c59c79
Author: Campbell Barton
Date:   Mon Jul 30 16:41:28 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBf77f8198545ddea23a39686c001821c1a1c59c79

Merge branch 'master' into blender2.8

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



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