Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 20 Feb 2019 22:20:43 +0000 (23:20 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 20 Feb 2019 22:20:43 +0000 (23:20 +0100)

Trivial merge