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

[Campbell Barton]

Commit: 77d6c09dddedc714cdd8327e33c8d0ebcb128476
Author: Campbell Barton
Date:   Tue May 15 17:31:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB77d6c09dddedc714cdd8327e33c8d0ebcb128476

Merge branch 'master' into blender2.8

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



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