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

[Campbell Barton]

Commit: f3065ed36572b4a037e79395a4a729d146eeafd2
Author: Campbell Barton
Date:   Thu Jun 28 10:50:04 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf3065ed36572b4a037e79395a4a729d146eeafd2

Merge branch 'master' into blender2.8

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



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