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

[Campbell Barton]

Commit: 964c5421df53a5464edfce175bc985d262a6fa31
Author: Campbell Barton
Date:   Sat Jun 9 12:56:37 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB964c5421df53a5464edfce175bc985d262a6fa31

Merge branch 'master' into blender2.8

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



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