Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 9 Jan 2019 11:56:50 +0000 (12:56 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 9 Jan 2019 11:56:50 +0000 (12:56 +0100)

Trivial merge