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

[Bastien Montagne]

Commit: 17f458ff320c5c0a0c5cdaeb5da60926d3e03d68
Author: Bastien Montagne
Date:   Thu May 31 11:08:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB17f458ff320c5c0a0c5cdaeb5da60926d3e03d68

Merge branch 'master' into blender2.8

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



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