Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 13 Dec 2018 13:32:32 +0000 (14:32 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 13 Dec 2018 13:32:32 +0000 (14:32 +0100)

Trivial merge