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

[Lukas Stockner]

Commit: 1863883a248faa1fcae4b99332c8d5e6d3957845
Author: Lukas Stockner
Date:   Sun May 27 17:26:59 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1863883a248faa1fcae4b99332c8d5e6d3957845

Merge branch 'master' into blender2.8

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



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