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

[Campbell Barton]

Commit: f5d096798cda8cca34a31a4a4ce441cb655b982c
Author: Campbell Barton
Date:   Thu Jul 5 22:50:07 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf5d096798cda8cca34a31a4a4ce441cb655b982c

Merge branch 'master' into blender2.8

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



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