Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Oct 2017 12:39:22 +0000 (14:39 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 18 Oct 2017 12:39:22 +0000 (14:39 +0200)

Trivial merge