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

[Sergey Sharybin]

Commit: 0c4f69a2bfdc02dbebd2aaf6f6112cf899781321
Author: Sergey Sharybin
Date:   Fri Nov 3 16:17:01 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB0c4f69a2bfdc02dbebd2aaf6f6112cf899781321

Merge branch 'master' into blender2.8

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



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