Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Mar 2019 11:00:02 +0000 (12:00 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 4 Mar 2019 11:00:02 +0000 (12:00 +0100)

Trivial merge