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

[Campbell Barton]

Commit: 49b86bcfec6885952458b3791cfc599463f02a35
Author: Campbell Barton
Date:   Thu Jul 5 07:54:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB49b86bcfec6885952458b3791cfc599463f02a35

Merge branch 'master' into blender2.8

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



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