Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 16 Aug 2018 13:22:34 +0000 (15:22 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 16 Aug 2018 13:22:34 +0000 (15:22 +0200)

Trivial merge