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

[Sergey Sharybin]

Commit: a8f114258a4f6dbc43e21e20948a45ede9781ba9
Author: Sergey Sharybin
Date:   Wed Apr 25 13:35:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa8f114258a4f6dbc43e21e20948a45ede9781ba9

Merge branch 'master' into blender2.8

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



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