Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 28 Sep 2017 11:19:23 +0000 (16:19 +0500)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 28 Sep 2017 11:19:23 +0000 (16:19 +0500)

Trivial merge