Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Aug 2018 12:09:58 +0000 (14:09 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 30 Aug 2018 12:09:58 +0000 (14:09 +0200)

Trivial merge