[Bf-blender-cvs] [1f625cbfeab] blender2.8: Merge remote-tracking branch 'origin/master' into blender2.8

[Gaia Clary]

Commit: 1f625cbfeab5126d19bbba1f137dce3cc2b66173
Author: Gaia Clary
Date:   Fri Apr 20 15:13:06 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB1f625cbfeab5126d19bbba1f137dce3cc2b66173

Merge remote-tracking branch 'origin/master' into blender2.8

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



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