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

[Sergey Sharybin]

Commit: 21f16bb93e1e29a9737edc5bfddcecdcbdfd9f73
Author: Sergey Sharybin
Date:   Fri Mar 23 15:25:27 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB21f16bb93e1e29a9737edc5bfddcecdcbdfd9f73

Merge branch 'master' into blender2.8

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



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