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

[Campbell Barton]

Commit: 3f5d3aa0573b0359761102c0da2d789c67803f7b
Author: Campbell Barton
Date:   Wed Aug 1 16:39:34 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB3f5d3aa0573b0359761102c0da2d789c67803f7b

Merge branch 'master' into blender2.8

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



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