[Bf-blender-cvs] [06b9f000e5d] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 06b9f000e5d539420e3885bf1a0f4088dc718bf0
Author: Campbell Barton
Date:   Fri Jul 13 09:05:55 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB06b9f000e5d539420e3885bf1a0f4088dc718bf0

Merge branch 'master' into blender2.8

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



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