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

Trivial merge