[Bf-extensions-cvs] [10a4add4] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 10a4add4fae2adbc1dbf87df743a8cd00dc565aa
Author: Campbell Barton
Date:   Sat Jul 14 08:51:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBA10a4add4fae2adbc1dbf87df743a8cd00dc565aa

Merge branch 'master' into blender2.8

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



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