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

[Campbell Barton]

Commit: 6fbd210b9151e5c401330ca930b724f4d781bc48
Author: Campbell Barton
Date:   Wed Aug 8 11:05:08 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB6fbd210b9151e5c401330ca930b724f4d781bc48

Merge branch 'master' into blender2.8

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



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