Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Dec 2018 11:58:22 +0000 (12:58 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Dec 2018 11:58:22 +0000 (12:58 +0100)

Trivial merge