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

[Sergey Sharybin]

Commit: 554fb0e7e0d815053defa0b0ba63869b13cf48a4
Author: Sergey Sharybin
Date:   Fri May 4 15:21:42 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB554fb0e7e0d815053defa0b0ba63869b13cf48a4

Merge branch 'master' into blender2.8

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



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