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

Trivial merge