Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Sep 2017 13:10:39 +0000 (18:10 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Sep 2017 13:10:39 +0000 (18:10 +0500)

Trivial merge