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

[Campbell Barton]

Commit: 5b3545f99f2632b86e07dbe25343b46910be0483
Author: Campbell Barton
Date:   Fri Jul 6 07:56:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB5b3545f99f2632b86e07dbe25343b46910be0483

Merge branch 'master' into blender2.8

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



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