Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 11 Jan 2019 14:09:46 +0000 (15:09 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 11 Jan 2019 14:09:46 +0000 (15:09 +0100)

Trivial merge