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

[Campbell Barton]

Commit: 4163beb818fc743e5b0e1388fece488156027555
Author: Campbell Barton
Date:   Sun May 6 09:02:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB4163beb818fc743e5b0e1388fece488156027555

Merge branch 'master' into blender2.8

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



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