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

[Campbell Barton]

Commit: c2814f5b28235f8cd621ea9dc965b37c97801d76
Author: Campbell Barton
Date:   Mon Jul 2 18:18:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc2814f5b28235f8cd621ea9dc965b37c97801d76

Merge branch 'master' into blender2.8

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



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