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

[Campbell Barton]

Commit: 25b7bdb6a96acfa0a43a50d5087a2d9be17347c1
Author: Campbell Barton
Date:   Sat Jun 30 09:29:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB25b7bdb6a96acfa0a43a50d5087a2d9be17347c1

Merge branch 'master' into blender2.8

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



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