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

[Sergey Sharybin]

Commit: 22855f1a60e381d67872e51ed770f67b8417d024
Author: Sergey Sharybin
Date:   Tue May 2 15:40:23 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB22855f1a60e381d67872e51ed770f67b8417d024

Merge branch 'master' into blender2.8

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



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