Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 12 Sep 2018 10:29:19 +0000 (12:29 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 12 Sep 2018 10:29:19 +0000 (12:29 +0200)

Trivial merge