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

[Campbell Barton]

Commit: 3414a16705c1334d9685f3ab2ba5b04e2824a4dc
Author: Campbell Barton
Date:   Wed Jun 20 16:01:30 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3414a16705c1334d9685f3ab2ba5b04e2824a4dc

Merge branch 'master' into blender2.8

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



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