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

[Bastien Montagne]

Commit: 21298978f68db176b42fa10c79fa91e2d3b96be0
Author: Bastien Montagne
Date:   Wed May 9 12:35:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB21298978f68db176b42fa10c79fa91e2d3b96be0

Merge branch 'master' into blender2.8

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



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