[Bf-extensions-cvs] [84d556d3] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 84d556d381cb892f783642d2181515855ebd1732
Author: Campbell Barton
Date:   Tue Aug 7 10:09:56 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBA84d556d381cb892f783642d2181515855ebd1732

Merge branch 'master' into blender2.8

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



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