Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2018 12:45:08 +0000 (14:45 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2018 12:45:08 +0000 (14:45 +0200)

Trivial merge