Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 10 Nov 2017 09:36:46 +0000 (10:36 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 10 Nov 2017 09:36:46 +0000 (10:36 +0100)

Trivial merge