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

[Brecht Van Lommel]

Commit: 8b2297847f84e88015863b0cc89f8496928ea0e3
Author: Brecht Van Lommel
Date:   Thu Jun 28 00:13:52 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB8b2297847f84e88015863b0cc89f8496928ea0e3

Merge branch 'master' into blender2.8

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



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