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

[Brecht Van Lommel]

Commit: c7c6070a6469055a1a503acec47780a2de30c218
Author: Brecht Van Lommel
Date:   Thu May 25 02:48:14 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc7c6070a6469055a1a503acec47780a2de30c218

Merge branch 'master' into blender2.8

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



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