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

[Campbell Barton]

Commit: 1f539cd7efbc0589f365bf3b1d21774e6e126ef4
Author: Campbell Barton
Date:   Sat Jul 7 11:32:40 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1f539cd7efbc0589f365bf3b1d21774e6e126ef4

Merge branch 'master' into blender2.8

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



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