Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 29 Nov 2018 08:35:39 +0000 (09:35 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 29 Nov 2018 08:35:39 +0000 (09:35 +0100)

Trivial merge