Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Nov 2018 11:16:31 +0000 (12:16 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 12 Nov 2018 11:16:31 +0000 (12:16 +0100)

Trivial merge