Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Dec 2017 11:44:32 +0000 (12:44 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Dec 2017 11:44:32 +0000 (12:44 +0100)

Trivial merge