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

[Bastien Montagne]

Commit: f430f14df4eaf6ece3ac6114a882f0fdcfa96e44
Author: Bastien Montagne
Date:   Mon Jun 4 12:48:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf430f14df4eaf6ece3ac6114a882f0fdcfa96e44

Merge branch 'master' into blender2.8

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



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