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

[Brecht Van Lommel]

Commit: a9ea7864ae0e993be045e58dc924f65f0e20cc03
Author: Brecht Van Lommel
Date:   Sun May 6 20:15:14 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa9ea7864ae0e993be045e58dc924f65f0e20cc03

Merge branch 'master' into blender2.8

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



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