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

[Campbell Barton]

Commit: efdc0959b17fba969b25bcbf7318322a01d791d0
Author: Campbell Barton
Date:   Tue Aug 14 10:02:05 2018 +1000
Branches: blender2.8
https://developer.blender.org/rBefdc0959b17fba969b25bcbf7318322a01d791d0

Merge branch 'master' into blender2.8

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



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