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

[Bastien Montagne]

Commit: 3c524178bcbbcf3fd9b98f24409481ed061a38aa
Author: Bastien Montagne
Date:   Fri Apr 20 10:49:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3c524178bcbbcf3fd9b98f24409481ed061a38aa

Merge branch 'master' into blender2.8

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



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