Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 9 Aug 2017 07:12:16 +0000 (09:12 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 9 Aug 2017 07:12:16 +0000 (09:12 +0200)

Trivial merge