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

Trivial merge