Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Nov 2018 16:55:27 +0000 (17:55 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 28 Nov 2018 16:55:27 +0000 (17:55 +0100)

Trivial merge