Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2018 10:01:09 +0000 (12:01 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2018 10:01:09 +0000 (12:01 +0200)

Trivial merge