Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Dec 2018 16:40:27 +0000 (17:40 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Dec 2018 16:40:27 +0000 (17:40 +0100)

Trivial merge