Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 28 Aug 2017 08:33:29 +0000 (10:33 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 28 Aug 2017 08:33:29 +0000 (10:33 +0200)

Trivial merge