Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Jan 2019 10:57:03 +0000 (11:57 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 22 Jan 2019 10:57:03 +0000 (11:57 +0100)

Trivial merge